diff options
| author |   krw <krw@openbsd.org> | 2010-06-28 18:31:01 +0000 |
|---|---|---|
| committer | krw <krw@openbsd.org> | 2010-06-28 18:31:01 +0000 |
| commit | 8952d2e01a836be8c6602edcd10a105fd837aee4 (patch) | |
| tree | 7f8c56b5fcd6e61d834328df10e42768fb7badee /sys/arch/sparc | |
| parent | Update the Safe module to version 2.2.7 for CVE-2010-1168 and (diff) | |
| download | wireguard-openbsd-8952d2e01a836be8c6602edcd10a105fd837aee4.tar.xz wireguard-openbsd-8952d2e01a836be8c6602edcd10a105fd837aee4.zip | |
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/sparc')
| -rw-r--r-- | sys/arch/sparc/dev/esp.c | 11 | ||||
| -rw-r--r-- | sys/arch/sparc/dev/si.c | 13 |
2 files changed, 3 insertions, 21 deletions
diff --git a/sys/arch/sparc/dev/esp.c b/sys/arch/sparc/dev/esp.c index 67278090203..85120c54f8e 100644 --- a/sys/arch/sparc/dev/esp.c +++ b/sys/arch/sparc/dev/esp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: esp.c,v 1.31 2010/06/27 05:52:01 beck Exp $ */ +/* $OpenBSD: esp.c,v 1.32 2010/06/28 18:31:01 krw Exp $ */ /* $NetBSD: esp.c,v 1.69 1997/08/27 11:24:18 bouyer Exp $ */ /* @@ -140,13 +140,6 @@ struct scsi_adapter esp_switch = { NULL, }; -struct scsi_device esp_dev = { - NULL, /* Use default error handler */ - NULL, /* have a queue, served by this */ - NULL, /* have no async handler */ - NULL, /* Use default 'done' routine */ -}; - /* * Functions and the switch for the MI code. */ @@ -515,7 +508,7 @@ espattach(parent, self, aux) sc->sc_features |= NCR_F_DMASELECT; /* Do the common parts of attachment. */ - ncr53c9x_attach(sc, &esp_switch, &esp_dev); + ncr53c9x_attach(sc, &esp_switch); bootpath_store(1, NULL); } diff --git a/sys/arch/sparc/dev/si.c b/sys/arch/sparc/dev/si.c index 05e24802c0b..320b96e8980 100644 --- a/sys/arch/sparc/dev/si.c +++ b/sys/arch/sparc/dev/si.c @@ -1,4 +1,4 @@ -/* $OpenBSD: si.c,v 1.34 2010/06/27 05:52:01 beck Exp $ */ +/* $OpenBSD: si.c,v 1.35 2010/06/28 18:31:01 krw Exp $ */ /* $NetBSD: si.c,v 1.38 1997/08/27 11:24:20 bouyer Exp $ */ /*- @@ -211,16 +211,6 @@ static struct scsi_adapter si_ops = { NULL, /* free_dev() */ }; -/* This is copied from julian's bt driver */ -/* "so we have a default dev struct for our link struct." */ -static struct scsi_device si_dev = { - NULL, /* Use default error handler. */ - NULL, /* Use default start handler. */ - NULL, /* Use default async handler. */ - NULL, /* Use default "done" routine. */ -}; - - /* The Sun SCSI-3 VME controller. */ struct cfattach si_ca = { sizeof(struct si_softc), si_match, si_attach @@ -332,7 +322,6 @@ si_attach(parent, self, args) ncr_sc->sc_link.adapter_softc = sc; ncr_sc->sc_link.adapter_target = 7; ncr_sc->sc_link.adapter = &si_ops; - ncr_sc->sc_link.device = &si_dev; ncr_sc->sc_link.openings = 4; /* |