diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2010-06-28 18:31:03 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2010-06-28 18:31:03 +0000 |
| commit | 32d204697861b907520e94f82e392d3e7d6d661a (patch) | |
| tree | 7bad5a228621b81780b7712982b6a979ce2df424 /sys/arch/vax/vsa | |
| parent | 12135c2c16aaab7651a7b1c48ed35586452fadcc (diff) | |
Remove all adapter-specific 'struct scsi_device's. They are never used. First
step in elminating 'struct scsi_device' entirely.
Spotted and initial diff from matthew@.
ok matthew@ dlg@ deraadt@ marco@ miod@
Diffstat (limited to 'sys/arch/vax/vsa')
| -rw-r--r-- | sys/arch/vax/vsa/asc_vsbus.c | 12 | ||||
| -rw-r--r-- | sys/arch/vax/vsa/ncr.c | 10 |
2 files changed, 3 insertions, 19 deletions
diff --git a/sys/arch/vax/vsa/asc_vsbus.c b/sys/arch/vax/vsa/asc_vsbus.c index f4e5397911d..204d9ad0c01 100644 --- a/sys/arch/vax/vsa/asc_vsbus.c +++ b/sys/arch/vax/vsa/asc_vsbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: asc_vsbus.c,v 1.11 2010/06/26 23:24:44 guenther Exp $ */ +/* $OpenBSD: asc_vsbus.c,v 1.12 2010/06/28 18:31:01 krw Exp $ */ /* $NetBSD: asc_vsbus.c,v 1.22 2001/02/04 20:36:32 ragge Exp $ */ /*- @@ -111,14 +111,6 @@ struct scsi_adapter asc_vsbus_ops = { NULL }; -static struct scsi_device asc_vsbus_dev = { - NULL, /* Use the default error handler */ - NULL, /* have a queue, served by this */ - NULL, /* have no async handler */ - NULL, /* use the default done handler */ -}; - - /* * Functions and the switch for the MI code */ @@ -307,7 +299,7 @@ asc_vsbus_attach(struct device *parent, struct device *self, void *aux) sc->sc_maxxfer = 64 * 1024; /* Do the common parts of attachment. */ - ncr53c9x_attach(sc, &asc_vsbus_ops, &asc_vsbus_dev); + ncr53c9x_attach(sc, &asc_vsbus_ops); } /* diff --git a/sys/arch/vax/vsa/ncr.c b/sys/arch/vax/vsa/ncr.c index 769286f1039..1d237775e50 100644 --- a/sys/arch/vax/vsa/ncr.c +++ b/sys/arch/vax/vsa/ncr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ncr.c,v 1.26 2010/06/26 23:24:44 guenther Exp $ */ +/* $OpenBSD: ncr.c,v 1.27 2010/06/28 18:31:01 krw Exp $ */ /* $NetBSD: ncr.c,v 1.32 2000/06/25 16:00:43 ragge Exp $ */ /*- @@ -125,13 +125,6 @@ struct scsi_adapter si_ops = { NULL /* free_dev() */ }; -struct scsi_device si_dev = { - NULL, /* use default error handler */ - NULL, /* no start function */ - NULL, /* no async handler */ - NULL /* use default done routine */ -}; - struct cfattach ncr_ca = { sizeof(struct si_softc), si_match, si_attach }; @@ -245,7 +238,6 @@ si_attach(parent, self, aux) ncr_sc->sc_link.adapter_softc = sc; ncr_sc->sc_link.adapter_target = target; ncr_sc->sc_link.adapter = &si_ops; - ncr_sc->sc_link.device = &si_dev; ncr_sc->sc_link.openings = 4; /* |