diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2010-09-12 02:05:55 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2010-09-12 02:05:55 +0000 |
| commit | 71f4ddba9acdc6b0d58b5a7afdbac4b40ec8ee29 (patch) | |
| tree | b3e4b739d093496300c46d7720ad2a5822e9a106 /sys/scsi | |
| parent | 2f452b6886bae5137c0af9e91fa8361f9166cf90 (diff) | |
Garbage collect rot_rate from disk_parms. No longer in disk label so no
need to calculate and save. Not used anywhere in tree.
Diffstat (limited to 'sys/scsi')
| -rw-r--r-- | sys/scsi/sd.c | 6 | ||||
| -rw-r--r-- | sys/scsi/sdvar.h | 3 |
2 files changed, 2 insertions, 7 deletions
diff --git a/sys/scsi/sd.c b/sys/scsi/sd.c index 0ac1c5f3b57..d6cd0fb0093 100644 --- a/sys/scsi/sd.c +++ b/sys/scsi/sd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sd.c,v 1.213 2010/09/11 22:40:10 krw Exp $ */ +/* $OpenBSD: sd.c,v 1.214 2010/09/12 02:05:54 krw Exp $ */ /* $NetBSD: sd.c,v 1.111 1997/04/02 02:29:41 mycroft Exp $ */ /*- @@ -1404,7 +1404,6 @@ sd_get_parms(struct sd_softc *sc, struct disk_parms *dp, int flags) struct page_flex_geometry *flex = NULL; struct page_reduced_geometry *reduced = NULL; u_int32_t heads = 0, sectors = 0, cyls = 0, secsize = 0, sssecsize; - u_int16_t rpm = 0; int err; dp->disksize = scsi_size(sc->sc_link, flags, &sssecsize); @@ -1457,7 +1456,6 @@ sd_get_parms(struct sd_softc *sc, struct disk_parms *dp, int flags) if (!err && rigid && DISK_PGCODE(rigid, PAGE_RIGID_GEOMETRY)) { heads = rigid->nheads; cyls = _3btol(rigid->ncyl); - rpm = _2btol(rigid->rpm); if (heads * cyls > 0) sectors = dp->disksize / (heads * cyls); } else { @@ -1470,7 +1468,6 @@ sd_get_parms(struct sd_softc *sc, struct disk_parms *dp, int flags) sectors = flex->ph_sec_tr; heads = flex->nheads; cyls = _2btol(flex->ncyl); - rpm = _2btol(flex->rpm); if (secsize == 0) secsize = _2btol(flex->bytes_s); if (dp->disksize == 0) @@ -1528,7 +1525,6 @@ validate: */ dp->heads = (heads == 0) ? 255 : heads; dp->sectors = (sectors == 0) ? 63 : sectors; - dp->rot_rate = (rpm == 0) ? 3600 : rpm; } dp->cyls = (cyls == 0) ? dp->disksize / (dp->heads * dp->sectors) : diff --git a/sys/scsi/sdvar.h b/sys/scsi/sdvar.h index b54621b49bc..60ce2cf182b 100644 --- a/sys/scsi/sdvar.h +++ b/sys/scsi/sdvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: sdvar.h,v 1.33 2010/09/11 22:40:10 krw Exp $ */ +/* $OpenBSD: sdvar.h,v 1.34 2010/09/12 02:05:54 krw Exp $ */ /* $NetBSD: sdvar.h,v 1.7 1998/08/17 00:49:03 mycroft Exp $ */ /*- @@ -68,7 +68,6 @@ struct sd_softc { u_long cyls; /* number of cylinders */ u_long sectors; /* number of sectors/track */ u_long secsize; /* number of bytes/sector */ - u_long rot_rate; /* rotational rate, in RPM */ daddr64_t disksize; /* total number sectors */ } params; void *sc_sdhook; /* our shutdown hook */ |