diff options
| author |   matthew <matthew@openbsd.org> | 2011-07-05 21:39:56 +0000 |
|---|---|---|
| committer | matthew <matthew@openbsd.org> | 2011-07-05 21:39:56 +0000 |
| commit | 912a55f01265354f959cf00607c8e7740209402b (patch) | |
| tree | a68795a4cd2841e513700cd11750b1c8e7ff509a | |
| parent | Add DIOCGPDINFO to rxioctl(), as a synonym for DIOCGDINFO, the last (diff) | |
| download | wireguard-openbsd-912a55f01265354f959cf00607c8e7740209402b.tar.xz wireguard-openbsd-912a55f01265354f959cf00607c8e7740209402b.zip | |
Garbage collect SDEV_S_WAITING and scsi_link->scsibus now that nothing
needs either of them.
ok krw@
| -rw-r--r-- | sys/scsi/scsiconf.c | 3 | ||||
| -rw-r--r-- | sys/scsi/scsiconf.h | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/sys/scsi/scsiconf.c b/sys/scsi/scsiconf.c index 08b04930ef4..454e8fbc219 100644 --- a/sys/scsi/scsiconf.c +++ b/sys/scsi/scsiconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: scsiconf.c,v 1.177 2011/07/03 15:47:18 matthew Exp $ */ +/* $OpenBSD: scsiconf.c,v 1.178 2011/07/05 21:39:56 matthew Exp $ */ /* $NetBSD: scsiconf.c,v 1.57 1996/05/02 01:09:01 neil Exp $ */ /* @@ -155,7 +155,6 @@ scsibusattach(struct device *parent, struct device *self, void *aux) scsi_autoconf = 0; sc_link_proto->bus = sb; - sc_link_proto->scsibus = sb->sc_dev.dv_unit; sb->adapter_link = sc_link_proto; if (sb->adapter_link->adapter_buswidth == 0) sb->adapter_link->adapter_buswidth = 8; diff --git a/sys/scsi/scsiconf.h b/sys/scsi/scsiconf.h index c7db4893d5e..a8e10e0a9d3 100644 --- a/sys/scsi/scsiconf.h +++ b/sys/scsi/scsiconf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: scsiconf.h,v 1.145 2011/06/15 01:10:05 dlg Exp $ */ +/* $OpenBSD: scsiconf.h,v 1.146 2011/07/05 21:39:56 matthew Exp $ */ /* $NetBSD: scsiconf.h,v 1.35 1997/04/02 02:29:38 mycroft Exp $ */ /* @@ -353,10 +353,8 @@ struct scsi_link { SLIST_ENTRY(scsi_link) bus_list; u_int state; -#define SDEV_S_WAITING (1<<0) #define SDEV_S_DYING (1<<1) - u_int8_t scsibus; /* the Nth scsibus */ u_int8_t luns; u_int16_t target; /* targ of this dev */ u_int16_t lun; /* lun of this dev */ |