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, 3 insertions, 12 deletions

diff --git a/sys/arch/macppc/dev/esp.c b/sys/arch/macppc/dev/esp.c
index 79f02644acd..e7941452123 100644
--- a/sys/arch/macppc/dev/esp.c
+++ b/sys/arch/macppc/dev/esp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: esp.c,v 1.6 2010/06/26 23:24:43 guenther Exp $ */
+/* $OpenBSD: esp.c,v 1.7 2010/06/28 18:31:01 krw Exp $ */
 
 /*-
  * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -139,10 +139,6 @@ struct scsi_adapter esp_switch = {
 	ncr53c9x_scsi_cmd, scsi_minphys, NULL, NULL,
 };
 
-struct scsi_device esp_dev = {
-	NULL, NULL, NULL, NULL,
-};
-
 /*
  * Functions and the switch for the MI code.
  */
@@ -270,7 +266,7 @@ espattach(struct device *parent, struct device *self, void *aux)
 	/* Turn on target selection using the `DMA' method */
 	sc->sc_features |= NCR_F_DMASELECT;
 
-	ncr53c9x_attach(sc, &esp_switch, &esp_dev);
+	ncr53c9x_attach(sc, &esp_switch);
 
 }
 
diff --git a/sys/arch/macppc/dev/mesh.c b/sys/arch/macppc/dev/mesh.c
index c3862017f85..e5ac438ecc2 100644
--- a/sys/arch/macppc/dev/mesh.c
+++ b/sys/arch/macppc/dev/mesh.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mesh.c,v 1.26 2010/04/09 17:01:30 jasper Exp $	*/
+/*	$OpenBSD: mesh.c,v 1.27 2010/06/28 18:31:01 krw Exp $	*/
 /*	$NetBSD: mesh.c,v 1.1 1999/02/19 13:06:03 tsubai Exp $	*/
 
 /*-
@@ -255,10 +255,6 @@ struct scsi_adapter mesh_switch = {
 	mesh_scsi_cmd, mesh_minphys, NULL, NULL
 };
 
-struct scsi_device mesh_dev = {
-	NULL, NULL, NULL, NULL
-};
-
 #define MESH_DATAOUT	0
 #define MESH_DATAIN	MESH_STATUS0_IO
 #define MESH_COMMAND	MESH_STATUS0_CD
@@ -354,7 +350,6 @@ mesh_attach(struct device *parent, struct device *self, void *aux)
 
 	sc->sc_link.adapter_softc = sc;
 	sc->sc_link.adapter_target = sc->sc_id;
-	sc->sc_link.device = &mesh_dev;
 	sc->sc_link.adapter = &mesh_switch;
 	sc->sc_link.openings = 2;