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@

3 files changed, 3 insertions, 30 deletions

diff --git a/sys/dev/isa/aha.c b/sys/dev/isa/aha.c
index 1ba599c9959..7892fb223d4 100644
--- a/sys/dev/isa/aha.c
+++ b/sys/dev/isa/aha.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: aha.c,v 1.70 2010/06/26 23:24:44 guenther Exp $	*/
+/*	$OpenBSD: aha.c,v 1.71 2010/06/28 18:31:02 krw Exp $	*/
 /*	$NetBSD: aha.c,v 1.11 1996/05/12 23:51:23 mycroft Exp $	*/
 
 #undef AHADIAG
@@ -161,14 +161,6 @@ struct scsi_adapter aha_switch = {
 	0,
 };
 
-/* the below structure is so we have a default dev struct for out link struct */
-struct scsi_device aha_dev = {
-	NULL,			/* Use default error handler */
-	NULL,			/* have a queue, served by this */
-	NULL,			/* have no async handler */
-	NULL,			/* Use default 'done' routine */
-};
-
 int	aha_isapnp_probe(struct device *, void *, void *);
 int	ahaprobe(struct device *, void *, void *);
 void	ahaattach(struct device *, struct device *, void *);
@@ -399,7 +391,6 @@ ahaattach(parent, self, aux)
 	sc->sc_link.adapter_softc = sc;
 	sc->sc_link.adapter_target = sc->sc_scsi_dev;
 	sc->sc_link.adapter = &aha_switch;
-	sc->sc_link.device = &aha_dev;
 	sc->sc_link.openings = 2;
 
 	bzero(&saa, sizeof(saa));
diff --git a/sys/dev/isa/seagate.c b/sys/dev/isa/seagate.c
index 2caee4c46a9..f678fa2e176 100644
--- a/sys/dev/isa/seagate.c
+++ b/sys/dev/isa/seagate.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: seagate.c,v 1.35 2010/06/26 23:24:44 guenther Exp $	*/
+/*	$OpenBSD: seagate.c,v 1.36 2010/06/28 18:31:02 krw Exp $	*/
 
 /*
  * ST01/02, Future Domain TMC-885, TMC-950 SCSI driver
@@ -295,14 +295,6 @@ struct scsi_adapter sea_switch = {
 	0,
 };
 
-/* the below structure is so we have a default dev struct for our link struct */
-struct scsi_device sea_dev = {
-	NULL,		/* use default error handler */
-	NULL,		/* have a queue, served by this */
-	NULL,		/* have no async handler */
-	NULL,		/* Use default 'done' routine */
-};
-
 int	seaprobe(struct device *, void *, void *);
 void	seaattach(struct device *, struct device *, void *);
 int	seaprint(void *, const char *);
@@ -434,7 +426,6 @@ seaattach(struct device *parent, struct device *self, void *aux)
 	sea->sc_link.adapter_softc = sea;
 	sea->sc_link.adapter_target = sea->our_id;
 	sea->sc_link.adapter = &sea_switch;
-	sea->sc_link.device = &sea_dev;
 	sea->sc_link.openings = 1;
 
 	printf("\n");
diff --git a/sys/dev/isa/wds.c b/sys/dev/isa/wds.c
index 1e4e6c7f554..9660b92820b 100644
--- a/sys/dev/isa/wds.c
+++ b/sys/dev/isa/wds.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wds.c,v 1.35 2010/06/26 23:24:44 guenther Exp $	*/
+/*	$OpenBSD: wds.c,v 1.36 2010/06/28 18:31:02 krw Exp $	*/
 /*	$NetBSD: wds.c,v 1.13 1996/11/03 16:20:31 mycroft Exp $	*/
 
 #undef	WDSDIAG
@@ -174,14 +174,6 @@ struct scsi_adapter wds_switch = {
 	0,
 };
 
-/* the below structure is so we have a default dev struct for our link struct */
-struct scsi_device wds_dev = {
-	NULL,			/* Use default error handler */
-	NULL,			/* have a queue, served by this */
-	NULL,			/* have no async handler */
-	NULL,			/* Use default 'done' routine */
-};
-
 int	wdsprobe(struct device *, void *, void *);
 void	wdsattach(struct device *, struct device *, void *);
 
@@ -312,7 +304,6 @@ wdsattach(parent, self, aux)
 	sc->sc_link.adapter_softc = sc;
 	sc->sc_link.adapter_target = sc->sc_scsi_dev;
 	sc->sc_link.adapter = &wds_switch;
-	sc->sc_link.device = &wds_dev;
 	/* XXX */
 	/* I don't think the -ASE can handle openings > 1. */
 	/* It gives Vendor Error 26 whenever I try it.     */