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@

4 files changed, 4 insertions, 36 deletions

diff --git a/sys/arch/mvme68k/dev/vs.c b/sys/arch/mvme68k/dev/vs.c
index 55b6c108eb0..c50800a64ad 100644
--- a/sys/arch/mvme68k/dev/vs.c
+++ b/sys/arch/mvme68k/dev/vs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vs.c,v 1.32 2010/05/20 00:55:17 krw Exp $ */
+/*	$OpenBSD: vs.c,v 1.33 2010/06/28 18:31:01 krw Exp $ */
 
 /*
  * Copyright (c) 2004, 2009, Miodrag Vallat.
@@ -73,13 +73,6 @@ struct scsi_adapter vs_scsiswitch = {
 	0,			/* no lun support */
 };
 
-struct scsi_device vs_scsidev = {
-	NULL,		/* use default error handler */
-	NULL,		/* do not have a start function */
-	NULL,		/* have no async handler */
-	NULL,		/* Use default done routine */
-};
-
 struct cfattach vs_ca = {
 	sizeof(struct vs_softc), vsmatch, vsattach,
 };
@@ -232,7 +225,6 @@ vsattach(struct device *parent, struct device *self, void *args)
 		sc_link->adapter_buswidth = vc->vc_width;
 		sc_link->adapter_softc = sc;
 		sc_link->adapter_target = vc->vc_id;
-		sc_link->device = &vs_scsidev;
 		if (sc->sc_bid != JAGUAR)
 			sc_link->luns = 1;	/* not enough queues */
 		sc_link->openings = 1;
diff --git a/sys/arch/mvme68k/dev/vsbic.c b/sys/arch/mvme68k/dev/vsbic.c
index 8d10bec56a1..a20fbff178b 100644
--- a/sys/arch/mvme68k/dev/vsbic.c
+++ b/sys/arch/mvme68k/dev/vsbic.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vsbic.c,v 1.5 2010/03/23 01:57:19 krw Exp $	*/
+/*	$OpenBSD: vsbic.c,v 1.6 2010/06/28 18:31:01 krw Exp $	*/
 
 /*
  * Copyright (c) 2008, 2009  Miodrag Vallat.
@@ -429,13 +429,6 @@ struct scsi_adapter vsbic_swtch = {
 	scsi_minphys
 };
 
-struct scsi_device vsbic_scsidev = {
-	NULL,
-	NULL,
-	NULL,
-	NULL
-};
-
 #define	MVME327_CSR_ID		0xff
 #define	MVME327_CSR_SIZE	0x100
 
@@ -547,7 +540,6 @@ vsbic_attach(struct device *parent, struct device *self, void *args)
 	sc->sc_link.adapter_buswidth = 8;
 	sc->sc_link.adapter_softc = sc;
 	sc->sc_link.adapter_target = sc->sc_id;
-	sc->sc_link.device = &vsbic_scsidev;
 	sc->sc_link.openings = VSBIC_NUMOPENINGS;
 
 	bzero(&saa, sizeof saa);
diff --git a/sys/arch/mvme68k/dev/vsdma.c b/sys/arch/mvme68k/dev/vsdma.c
index bafcef817a2..e9373efbccc 100644
--- a/sys/arch/mvme68k/dev/vsdma.c
+++ b/sys/arch/mvme68k/dev/vsdma.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vsdma.c,v 1.13 2009/02/16 21:19:06 miod Exp $ */
+/*	$OpenBSD: vsdma.c,v 1.14 2010/06/28 18:31:01 krw Exp $ */
 /*
  * Copyright (c) 1999 Steve Murphree, Jr.
  * All rights reserved.
@@ -67,13 +67,6 @@ struct scsi_adapter vs_scsiswitch = {
 	0,			/* no lun support */
 };
 
-struct scsi_device vs_scsidev = {
-	NULL,		/* use default error handler */
-	NULL,		/* do not have a start function */
-	NULL,		/* have no async handler */
-	NULL,		/* Use default done routine */
-};
-
 struct cfattach vs_ca = {
         sizeof(struct vs_softc), vsmatch, vsattach,
 };    
@@ -110,7 +103,6 @@ vsattach(parent, self, auxp)
 	sc->sc_link.adapter_softc = sc;
 	sc->sc_link.adapter_target = 7;
 	sc->sc_link.adapter = &vs_scsiswitch;
-	sc->sc_link.device = &vs_scsidev;
 	sc->sc_link.luns = 1;
 	sc->sc_link.openings = 1;
 
diff --git a/sys/arch/mvme68k/dev/wdsc.c b/sys/arch/mvme68k/dev/wdsc.c
index 296447b434f..229470ca055 100644
--- a/sys/arch/mvme68k/dev/wdsc.c
+++ b/sys/arch/mvme68k/dev/wdsc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wdsc.c,v 1.16 2009/02/16 21:19:06 miod Exp $ */
+/*	$OpenBSD: wdsc.c,v 1.17 2010/06/28 18:31:01 krw Exp $ */
 
 /*
  * Copyright (c) 1996 Steve Woodford
@@ -64,13 +64,6 @@ struct scsi_adapter wdsc_scsiswitch = {
 	0,          /* no lun support */
 };
 
-struct scsi_device wdsc_scsidev = {
-	NULL,       /* use default error handler */
-	NULL,       /* do not have a start function */
-	NULL,       /* have no async handler */
-	NULL,       /* Use default done routine */
-};
-
 struct cfattach wdsc_ca = {
 	sizeof(struct sbic_softc), (cfmatch_t)wdscmatch, wdscattach
 };
@@ -126,7 +119,6 @@ wdscattach(parent, self, aux)
 	sc->sc_link.adapter_softc  = sc;
 	sc->sc_link.adapter_target = 7;
 	sc->sc_link.adapter        = &wdsc_scsiswitch;
-	sc->sc_link.device         = &wdsc_scsidev;
 	sc->sc_link.openings       = 2;
 
 	sc->sc_sbicp = (sbic_regmap_p)ca->ca_vaddr;