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/dev/tc | |
| 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/dev/tc')
| -rw-r--r-- | sys/dev/tc/asc.c | 9 | ||||
| -rw-r--r-- | sys/dev/tc/asc_tc.c | 5 | ||||
| -rw-r--r-- | sys/dev/tc/asc_tcds.c | 5 |
3 files changed, 5 insertions, 14 deletions
diff --git a/sys/dev/tc/asc.c b/sys/dev/tc/asc.c index 6bf47cc5312..ead505bdf44 100644 --- a/sys/dev/tc/asc.c +++ b/sys/dev/tc/asc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: asc.c,v 1.24 2009/02/16 21:19:07 miod Exp $ */ +/* $OpenBSD: asc.c,v 1.25 2010/06/28 18:31:02 krw Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -77,13 +77,6 @@ struct scsi_adapter asc_switch = { NULL, }; -struct scsi_device asc_dev = { - NULL, /* Use default error handler */ - NULL, /* have a queue, served by this */ - NULL, /* have no async handler */ - NULL, /* Use default `done' routine */ -}; - /* * Glue functions */ diff --git a/sys/dev/tc/asc_tc.c b/sys/dev/tc/asc_tc.c index af9f0930dd6..caaee612c4e 100644 --- a/sys/dev/tc/asc_tc.c +++ b/sys/dev/tc/asc_tc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: asc_tc.c,v 1.9 2008/08/09 16:42:30 miod Exp $ */ +/* $OpenBSD: asc_tc.c,v 1.10 2010/06/28 18:31:02 krw Exp $ */ /* $NetBSD: asc_tc.c,v 1.19 2001/11/15 09:48:19 lukem Exp $ */ /*- @@ -62,7 +62,6 @@ struct cfattach asc_tc_ca = { }; extern struct scsi_adapter asc_switch; -extern struct scsi_device asc_dev; int asc_dma_isintr(struct ncr53c9x_softc *); void asc_tc_reset(struct ncr53c9x_softc *); @@ -180,7 +179,7 @@ asc_tc_attach(parent, self, aux) sc->sc_maxxfer = 64 * 1024; /* Do the common parts of attachment. */ - ncr53c9x_attach(sc, &asc_switch, &asc_dev); + ncr53c9x_attach(sc, &asc_switch); } void diff --git a/sys/dev/tc/asc_tcds.c b/sys/dev/tc/asc_tcds.c index 8ccd54528de..4d3f4d1522a 100644 --- a/sys/dev/tc/asc_tcds.c +++ b/sys/dev/tc/asc_tcds.c @@ -1,4 +1,4 @@ -/* $OpenBSD: asc_tcds.c,v 1.6 2008/08/09 16:42:30 miod Exp $ */ +/* $OpenBSD: asc_tcds.c,v 1.7 2010/06/28 18:31:02 krw Exp $ */ /* $NetBSD: asc_tcds.c,v 1.5 2001/11/15 09:48:19 lukem Exp $ */ /*- @@ -114,7 +114,6 @@ struct ncr53c9x_glue asc_tcds_glue = { }; extern struct scsi_adapter asc_switch; -extern struct scsi_device asc_dev; int asc_tcds_match(parent, cf, aux) @@ -211,7 +210,7 @@ asc_tcds_attach(parent, self, aux) sc->sc_maxxfer = 64 * 1024; /* Do the common parts of attachment. */ - ncr53c9x_attach(sc, &asc_switch, &asc_dev); + ncr53c9x_attach(sc, &asc_switch); } void |