dtucker@ pointed out i suck at grep.

fix ncr53c9x fallout.

3 files changed, 6 insertions, 25 deletions

diff --git a/sys/arch/macppc/dev/esp.c b/sys/arch/macppc/dev/esp.c
index f96262666e8..2d585534133 100644
--- a/sys/arch/macppc/dev/esp.c
+++ b/sys/arch/macppc/dev/esp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: esp.c,v 1.10 2013/12/06 21:03:05 deraadt Exp $ */
+/* $OpenBSD: esp.c,v 1.11 2014/01/21 03:42:21 dlg Exp $ */
 
 /*-
  * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -133,11 +133,6 @@ struct cfattach esp_ca = {
 	NULL, espactivate
 };
 
-struct scsi_adapter esp_switch = {
-	/* no max at this level; handled by DMA code */
-	ncr53c9x_scsi_cmd, scsi_minphys, NULL, NULL,
-};
-
 /*
  * Functions and the switch for the MI code.
  */
@@ -261,7 +256,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);
+	ncr53c9x_attach(sc);
 
 }
 
diff --git a/sys/arch/sparc/dev/esp.c b/sys/arch/sparc/dev/esp.c
index d7f6960f19e..112f696c10c 100644
--- a/sys/arch/sparc/dev/esp.c
+++ b/sys/arch/sparc/dev/esp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: esp.c,v 1.33 2010/07/10 19:32:24 miod Exp $	*/
+/*	$OpenBSD: esp.c,v 1.34 2014/01/21 03:42:21 dlg Exp $	*/
 /*	$NetBSD: esp.c,v 1.69 1997/08/27 11:24:18 bouyer Exp $	*/
 
 /*
@@ -133,13 +133,6 @@ struct cfattach esp_ca = {
 	sizeof(struct esp_softc), espmatch, espattach
 };
 
-struct scsi_adapter esp_switch = {
-	ncr53c9x_scsi_cmd,
-	scsi_minphys,		/* no max at this level; handled by DMA code */
-	NULL,
-	NULL,
-};
-
 /*
  * Functions and the switch for the MI code.
  */
@@ -508,7 +501,7 @@ espattach(parent, self, aux)
 		sc->sc_features |= NCR_F_DMASELECT;
 
 	/* Do the common parts of attachment. */
-	ncr53c9x_attach(sc, &esp_switch);
+	ncr53c9x_attach(sc);
 
 	bootpath_store(1, NULL);
 }
diff --git a/sys/arch/vax/vsa/asc_vsbus.c b/sys/arch/vax/vsa/asc_vsbus.c
index 4a9a32dbadc..f52da75f5d7 100644
--- a/sys/arch/vax/vsa/asc_vsbus.c
+++ b/sys/arch/vax/vsa/asc_vsbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: asc_vsbus.c,v 1.15 2012/12/05 23:20:15 deraadt Exp $	*/
+/*	$OpenBSD: asc_vsbus.c,v 1.16 2014/01/21 03:42:21 dlg Exp $	*/
 /*	$NetBSD: asc_vsbus.c,v 1.22 2001/02/04 20:36:32 ragge Exp $	*/
 
 /*-
@@ -102,13 +102,6 @@ struct cfdriver asc_cd = {
 	NULL, "asc", DV_DULL
 };
 
-struct scsi_adapter	asc_vsbus_ops = {
-	ncr53c9x_scsi_cmd,	
-	scsi_minphys,
-	NULL,
-	NULL
-};
-
 /*
  * Functions and the switch for the MI code
  */
@@ -300,7 +293,7 @@ asc_vsbus_attach(struct device *parent, struct device *self, void *aux)
 	sc->sc_maxxfer = 64 * 1024;
 
 	/* Do the common parts of attachment. */
-	ncr53c9x_attach(sc, &asc_vsbus_ops);
+	ncr53c9x_attach(sc);
 }
 
 /*