Let's all agree to call our scsi_adapter variable '<dev>_switch'.

4 files changed, 12 insertions, 12 deletions

diff --git a/sys/dev/ic/ncr53c9x.c b/sys/dev/ic/ncr53c9x.c
index 8bbaf42cf52..49e26f7b6a6 100644
--- a/sys/dev/ic/ncr53c9x.c
+++ b/sys/dev/ic/ncr53c9x.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ncr53c9x.c,v 1.67 2020/02/05 16:29:29 krw Exp $	*/
+/*	$OpenBSD: ncr53c9x.c,v 1.68 2020/02/14 18:37:03 krw Exp $	*/
 /*     $NetBSD: ncr53c9x.c,v 1.56 2000/11/30 14:41:46 thorpej Exp $    */
 
 /*
@@ -149,7 +149,7 @@ void	ncr53c9x_scsi_cmd(struct scsi_xfer *);
 int	ncr53c9x_scsi_probe(struct scsi_link *);
 void	ncr53c9x_scsi_free(struct scsi_link *);
 
-struct scsi_adapter ncr53c9x_adapter = {
+struct scsi_adapter ncr53c9x_switch = {
 	ncr53c9x_scsi_cmd, NULL, ncr53c9x_scsi_probe,
 	ncr53c9x_scsi_free, NULL
 };
@@ -266,7 +266,7 @@ ncr53c9x_attach(sc)
 	 */
 	sc->sc_link.adapter_softc = sc;
 	sc->sc_link.adapter_target = sc->sc_id;
-	sc->sc_link.adapter = &ncr53c9x_adapter;
+	sc->sc_link.adapter = &ncr53c9x_switch;
 	sc->sc_link.openings = 2;
 	sc->sc_link.adapter_buswidth = sc->sc_ntarg;
 	sc->sc_link.pool = &ecb_iopool;
diff --git a/sys/dev/ic/oosiop.c b/sys/dev/ic/oosiop.c
index 38f67dc46dd..250d0c1804f 100644
--- a/sys/dev/ic/oosiop.c
+++ b/sys/dev/ic/oosiop.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: oosiop.c,v 1.24 2020/01/25 21:48:42 krw Exp $	*/
+/*	$OpenBSD: oosiop.c,v 1.25 2020/02/14 18:37:03 krw Exp $	*/
 /*	$NetBSD: oosiop.c,v 1.4 2003/10/29 17:45:55 tsutsui Exp $	*/
 
 /*
@@ -129,7 +129,7 @@ struct cfdriver oosiop_cd = {
 	NULL, "oosiop", DV_DULL
 };
 
-struct scsi_adapter oosiop_adapter = {
+struct scsi_adapter oosiop_switch = {
 	oosiop_scsicmd, oosiop_minphys, NULL, NULL, NULL
 };
 
@@ -260,7 +260,7 @@ oosiop_attach(struct oosiop_softc *sc)
 	/*
 	 * Fill in the sc_link.
 	 */
-	sc->sc_link.adapter = &oosiop_adapter;
+	sc->sc_link.adapter = &oosiop_switch;
 	sc->sc_link.adapter_softc = sc;
 	sc->sc_link.openings = 1;	/* XXX */
 	sc->sc_link.adapter_buswidth = OOSIOP_NTGT;
diff --git a/sys/dev/ic/osiop.c b/sys/dev/ic/osiop.c
index 9622de0debd..9740297e217 100644
--- a/sys/dev/ic/osiop.c
+++ b/sys/dev/ic/osiop.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: osiop.c,v 1.54 2020/02/05 16:29:29 krw Exp $	*/
+/*	$OpenBSD: osiop.c,v 1.55 2020/02/14 18:37:03 krw Exp $	*/
 /*	$NetBSD: osiop.c,v 1.9 2002/04/05 18:27:54 bouyer Exp $	*/
 
 /*
@@ -180,7 +180,7 @@ struct cfdriver osiop_cd = {
 	NULL, "osiop", DV_DULL
 };
 
-struct scsi_adapter osiop_adapter = {
+struct scsi_adapter osiop_switch = {
 	osiop_scsicmd, osiop_minphys, NULL, NULL, NULL
 };
 
@@ -328,7 +328,7 @@ osiop_attach(sc)
 	/*
 	 * Fill in the sc_link.
 	 */
-	sc->sc_link.adapter = &osiop_adapter;
+	sc->sc_link.adapter = &osiop_switch;
 	sc->sc_link.adapter_softc = sc;
 	sc->sc_link.openings = 4;
 	sc->sc_link.adapter_buswidth = OSIOP_NTGT;
diff --git a/sys/dev/ic/siop.c b/sys/dev/ic/siop.c
index efc3228bd4c..2c73472cc91 100644
--- a/sys/dev/ic/siop.c
+++ b/sys/dev/ic/siop.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: siop.c,v 1.72 2020/01/23 07:53:00 krw Exp $ */
+/*	$OpenBSD: siop.c,v 1.73 2020/02/14 18:37:03 krw Exp $ */
 /*	$NetBSD: siop.c,v 1.79 2005/11/18 23:10:32 bouyer Exp $	*/
 
 /*
@@ -103,7 +103,7 @@ struct cfdriver siop_cd = {
 	NULL, "siop", DV_DULL
 };
 
-struct scsi_adapter siop_adapter = {
+struct scsi_adapter siop_switch = {
 	siop_scsicmd, siop_minphys, siop_scsiprobe, siop_scsifree, NULL
 };
 
@@ -190,7 +190,7 @@ siop_attach(sc)
 	TAILQ_INIT(&sc->lunsw_list);
 	scsi_iopool_init(&sc->iopool, sc, siop_cmd_get, siop_cmd_put);
 	sc->sc_currschedslot = 0;
-	sc->sc_c.sc_link.adapter = &siop_adapter;
+	sc->sc_c.sc_link.adapter = &siop_switch;
 	sc->sc_c.sc_link.openings = SIOP_NTAG;
 	sc->sc_c.sc_link.pool = &sc->iopool;