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@

2 files changed, 2 insertions, 18 deletions

diff --git a/sys/arch/mvme88k/dev/vs.c b/sys/arch/mvme88k/dev/vs.c
index f86e65a3463..639a8c38cce 100644
--- a/sys/arch/mvme88k/dev/vs.c
+++ b/sys/arch/mvme88k/dev/vs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vs.c,v 1.80 2010/05/20 00:55:17 krw Exp $	*/
+/*	$OpenBSD: vs.c,v 1.81 2010/06/28 18:31:01 krw Exp $	*/
 
 /*
  * Copyright (c) 2004, 2009, Miodrag Vallat.
@@ -74,13 +74,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,
 };
@@ -217,7 +210,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/mvme88k/dev/vsbic.c b/sys/arch/mvme88k/dev/vsbic.c
index e65246e4f85..d90d2702e9f 100644
--- a/sys/arch/mvme88k/dev/vsbic.c
+++ b/sys/arch/mvme88k/dev/vsbic.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vsbic.c,v 1.6 2010/03/23 01:57:19 krw Exp $	*/
+/*	$OpenBSD: vsbic.c,v 1.7 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);