Date: Fri, 25 Dec 2020 19:28:31 GMT From: Marius Strobl <marius@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: eae35125e948 - ada(4): remove remainder of MD geometry translation support Message-ID: <202012251928.0BPJSVcB056411@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by marius: URL: https://cgit.FreeBSD.org/src/commit/?id=eae35125e948b2d92d3ba1d9687cb08086393ae8 commit eae35125e948b2d92d3ba1d9687cb08086393ae8 Author: Marius Strobl <marius@FreeBSD.org> AuthorDate: 2020-12-25 19:20:54 +0000 Commit: Marius Strobl <marius@FreeBSD.org> CommitDate: 2020-12-25 19:20:54 +0000 ada(4): remove remainder of MD geometry translation support This was missed in 9cf738228dc8563732f7cb332737a6d2b732e2e3 and r359718 respectively. --- sys/cam/ata/ata_da.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/sys/cam/ata/ata_da.c b/sys/cam/ata/ata_da.c index cd49776e4f8b..a34df577174c 100644 --- a/sys/cam/ata/ata_da.c +++ b/sys/cam/ata/ata_da.c @@ -894,14 +894,6 @@ static void adaresume(void *arg); #define ADA_WC (softc->write_cache >= 0 ? \ softc->write_cache : ada_write_cache) -/* - * Most platforms map firmware geometry to actual, but some don't. If - * not overridden, default to nothing. - */ -#ifndef ata_disk_firmware_geom_adjust -#define ata_disk_firmware_geom_adjust(disk) -#endif - static int ada_retry_count = ADA_DEFAULT_RETRY; static int ada_default_timeout = ADA_DEFAULT_TIMEOUT; static int ada_send_ordered = ADA_DEFAULT_SEND_ORDERED; @@ -3495,7 +3487,6 @@ adasetgeom(struct ada_softc *softc, struct ccb_getdev *cgd) } softc->disk->d_fwsectors = softc->params.secs_per_track; softc->disk->d_fwheads = softc->params.heads; - ata_disk_firmware_geom_adjust(softc->disk); softc->disk->d_rotation_rate = cgd->ident_data.media_rotation_rate; snprintf(softc->disk->d_attachment, sizeof(softc->disk->d_attachment), "%s%d", softc->cpi.dev_name, softc->cpi.unit_number);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202012251928.0BPJSVcB056411>