Nuke unused struct scsi_link members of adapter softc's where the

driver successfully compiles on one or more of amd64, i386, hppa.

41 files changed, 41 insertions, 101 deletions

diff --git a/sys/dev/ata/atascsi.c b/sys/dev/ata/atascsi.c
index 4a1a0008fd7..803b8ec5009 100644
--- a/sys/dev/ata/atascsi.c
+++ b/sys/dev/ata/atascsi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: atascsi.c,v 1.142 2020/07/20 14:41:12 krw Exp $ */
+/*	$OpenBSD: atascsi.c,v 1.143 2020/07/22 13:16:04 krw Exp $ */
 
 /*
  * Copyright (c) 2007 David Gwynne <dlg@openbsd.org>
@@ -44,7 +44,6 @@ struct atascsi {
 
 	struct atascsi_methods	*as_methods;
 	struct scsi_adapter	as_switch;
-	struct scsi_link	as_link;
 	struct scsibus_softc	*as_scsibus;
 
 	int			as_capability;
diff --git a/sys/dev/atapiscsi/atapiscsi.c b/sys/dev/atapiscsi/atapiscsi.c
index 83deb5ecc1a..2ec7f317bfc 100644
--- a/sys/dev/atapiscsi/atapiscsi.c
+++ b/sys/dev/atapiscsi/atapiscsi.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: atapiscsi.c,v 1.115 2020/07/20 14:41:12 krw Exp $     */
+/*      $OpenBSD: atapiscsi.c,v 1.116 2020/07/22 13:16:04 krw Exp $     */
 
 /*
  * This code is derived from code with the copyright below.
@@ -147,7 +147,6 @@ enum atapi_state { as_none, as_data, as_completed };
 
 struct atapiscsi_softc {
 	struct device  sc_dev;
-	struct  scsi_link  sc_adapterlink;
 	struct channel_softc *chp;
 	enum atapi_state protocol_phase;
 
diff --git a/sys/dev/ic/aacvar.h b/sys/dev/ic/aacvar.h
index d6d73486b25..fcadccfa662 100644
--- a/sys/dev/ic/aacvar.h
+++ b/sys/dev/ic/aacvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: aacvar.h,v 1.14 2019/10/05 20:41:27 jan Exp $	*/
+/*	$OpenBSD: aacvar.h,v 1.15 2020/07/22 13:16:04 krw Exp $	*/
 
 /*-
  * Copyright (c) 2000 Michael Smith
@@ -315,7 +315,6 @@ struct aac_softc
 {
 	struct device aac_dev;
 	void   *aac_ih;
-	struct	scsi_link aac_link;	/* Virtual SCSI bus for cache devs */
 
 	bus_space_tag_t aac_memt;
 	bus_space_handle_t aac_memh;
diff --git a/sys/dev/ic/advlib.h b/sys/dev/ic/advlib.h
index 50f620fa043..90bdd4e0814 100644
--- a/sys/dev/ic/advlib.h
+++ b/sys/dev/ic/advlib.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: advlib.h,v 1.11 2011/04/03 12:42:36 krw Exp $	*/
+/*	$OpenBSD: advlib.h,v 1.12 2020/07/22 13:16:04 krw Exp $	*/
 /*      $NetBSD: advlib.h,v 1.5 1998/10/28 20:39:46 dante Exp $        */
 
 /*
@@ -834,7 +834,6 @@ typedef struct asc_softc
 
 	struct adv_control	*sc_control; /* control structures */
 	TAILQ_HEAD(, adv_ccb)	sc_free_ccb, sc_waiting_ccb;
-	struct scsi_link	sc_link;     /* prototype for devs */
 	struct mutex		sc_ccb_mtx;
 	struct scsi_iopool	sc_iopool;
 
diff --git a/sys/dev/ic/adwlib.h b/sys/dev/ic/adwlib.h
index c5ecaecd7d1..ac08b6b7a8a 100644
--- a/sys/dev/ic/adwlib.h
+++ b/sys/dev/ic/adwlib.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: adwlib.h,v 1.15 2020/02/18 20:24:52 krw Exp $ */
+/*	$OpenBSD: adwlib.h,v 1.16 2020/07/22 13:16:04 krw Exp $ */
 /*      $NetBSD: adwlib.h,v 1.14 2000/07/03 18:14:18 dante Exp $        */
 
 /*
@@ -744,7 +744,6 @@ typedef struct adw_softc {
 	struct adw_ccb		*sc_ccbhash[CCB_HASH_SIZE];
 	TAILQ_HEAD(, adw_ccb)	sc_free_ccb, sc_waiting_ccb;
 	TAILQ_HEAD(adw_pending_ccb, adw_ccb)	sc_pending_ccb;
-	struct scsi_link	sc_link;     /* prototype for devs */
 	struct mutex		sc_ccb_mtx;
 	struct scsi_iopool	sc_iopool;
 
diff --git a/sys/dev/ic/aic6360var.h b/sys/dev/ic/aic6360var.h
index 1f7a033bc2e..3ee5ff8dd69 100644
--- a/sys/dev/ic/aic6360var.h
+++ b/sys/dev/ic/aic6360var.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: aic6360var.h,v 1.9 2017/04/30 16:45:45 mpi Exp $	*/
+/*	$OpenBSD: aic6360var.h,v 1.10 2020/07/22 13:16:04 krw Exp $	*/
 /*	$NetBSD: aic6360.c,v 1.52 1996/12/10 21:27:51 thorpej Exp $	*/
 
 /*
@@ -124,8 +124,6 @@ struct aic_softc {
 	bus_space_handle_t sc_ioh;
 	int sc_irq, sc_drq;
 
-	struct scsi_link sc_link;	/* prototype for subdevs */
-
 	TAILQ_HEAD(, aic_acb) free_list, ready_list, nexus_list;
 	struct aic_acb *sc_nexus;	/* current command */
 	struct aic_acb sc_acb[8];
diff --git a/sys/dev/ic/aic79xx.h b/sys/dev/ic/aic79xx.h
index 66a6664d459..2b7fa330ae7 100644
--- a/sys/dev/ic/aic79xx.h
+++ b/sys/dev/ic/aic79xx.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: aic79xx.h,v 1.27 2017/12/12 12:33:36 krw Exp $	*/
+/*	$OpenBSD: aic79xx.h,v 1.28 2020/07/22 13:16:04 krw Exp $	*/
 
 /*
  * Copyright (c) 2004 Milos Urbanek, Kenneth R. Westerback & Marco Peereboom
@@ -1045,7 +1045,6 @@ struct ahd_completion
 
 struct ahd_softc {
 	struct device		sc_dev;
-	struct scsi_link	sc_channel;
 	struct device *		sc_child;
 
 	bus_space_tag_t		tags[2];
diff --git a/sys/dev/ic/aic7xxxvar.h b/sys/dev/ic/aic7xxxvar.h
index 3b6b48ed9e5..a62700a6c7a 100644
--- a/sys/dev/ic/aic7xxxvar.h
+++ b/sys/dev/ic/aic7xxxvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: aic7xxxvar.h,v 1.34 2020/07/05 21:54:44 krw Exp $	*/
+/*	$OpenBSD: aic7xxxvar.h,v 1.35 2020/07/22 13:16:04 krw Exp $	*/
 /*
  * Core definitions and data structures shareable across OS platforms.
  *
@@ -38,7 +38,7 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGES.
  *
- * $Id: aic7xxxvar.h,v 1.34 2020/07/05 21:54:44 krw Exp $
+ * $Id: aic7xxxvar.h,v 1.35 2020/07/22 13:16:04 krw Exp $
  *
  * $FreeBSD: src/sys/dev/aic7xxx/aic7xxx.h,v 1.50 2003/12/17 00:02:09 gibbs Exp $
  */
@@ -935,8 +935,6 @@ typedef void ahc_callback_t (void *);
 struct ahc_softc {
 	struct device		  sc_dev;
 
-	struct scsi_link	  sc_channel;
-	struct scsi_link	  sc_channel_b;
 	struct scsibus_softc	 *sc_child;
 	struct scsibus_softc	 *sc_child_b;
 
diff --git a/sys/dev/ic/amivar.h b/sys/dev/ic/amivar.h
index c2929967e59..8e714b5e8d0 100644
--- a/sys/dev/ic/amivar.h
+++ b/sys/dev/ic/amivar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: amivar.h,v 1.59 2020/07/11 19:28:07 krw Exp $	*/
+/*	$OpenBSD: amivar.h,v 1.60 2020/07/22 13:16:04 krw Exp $	*/
 
 /*
  * Copyright (c) 2001 Michael Shalayeff
@@ -75,7 +75,6 @@ struct ami_ccb {
 TAILQ_HEAD(ami_ccb_list, ami_ccb);
 
 struct ami_rawsoftc {
-	struct scsi_link	sc_link;
 	struct ami_softc	*sc_softc;
 	u_int8_t		sc_channel;
 
@@ -86,7 +85,6 @@ struct ami_rawsoftc {
 struct ami_softc {
 	struct device		sc_dev;
 	void			*sc_ih;
-	struct scsi_link	sc_link;
 	struct scsibus_softc	*sc_scsibus;
 
 	int			sc_flags;
diff --git a/sys/dev/ic/cacvar.h b/sys/dev/ic/cacvar.h
index 4ea137f8724..ca777864a16 100644
--- a/sys/dev/ic/cacvar.h
+++ b/sys/dev/ic/cacvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cacvar.h,v 1.8 2020/07/11 21:17:11 krw Exp $	*/
+/*	$OpenBSD: cacvar.h,v 1.9 2020/07/22 13:16:04 krw Exp $	*/
 /*	$NetBSD: cacvar.h,v 1.7 2000/10/19 14:28:47 ad Exp $	*/
 
 /*-
@@ -100,7 +100,6 @@ struct cac_softc {
 	bus_dmamap_t		sc_dmamap;
 	int			sc_nunits;
 	void			*sc_ih;
-	struct scsi_link	sc_link;
 	struct scsibus_softc	*sc_scsibus;
 	const struct cac_linkage	*sc_cl;
 	caddr_t			sc_ccbs;
diff --git a/sys/dev/ic/cissvar.h b/sys/dev/ic/cissvar.h
index 95fb6f19668..38ced68a48e 100644
--- a/sys/dev/ic/cissvar.h
+++ b/sys/dev/ic/cissvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cissvar.h,v 1.15 2013/05/30 16:15:02 deraadt Exp $	*/
+/*	$OpenBSD: cissvar.h,v 1.16 2020/07/22 13:16:04 krw Exp $	*/
 
 /*
  * Copyright (c) 2005,2006 Michael Shalayeff
@@ -28,7 +28,6 @@ struct ciss_ld {
 
 struct ciss_softc {
 	struct device	sc_dev;
-	struct scsi_link sc_link;
 	struct timeout	sc_hb;
 	void		*sc_ih;
 	int		sc_flush;
diff --git a/sys/dev/ic/gdtvar.h b/sys/dev/ic/gdtvar.h
index eb1b6ba5e56..4ea8b84dd86 100644
--- a/sys/dev/ic/gdtvar.h
+++ b/sys/dev/ic/gdtvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: gdtvar.h,v 1.24 2020/02/15 01:58:01 krw Exp $	*/
+/*	$OpenBSD: gdtvar.h,v 1.25 2020/07/22 13:16:04 krw Exp $	*/
 
 /*
  * Copyright (c) 1999, 2000 Niklas Hallqvist.  All rights reserved.
@@ -104,7 +104,6 @@ gdt_ccb_set_cmd(struct gdt_ccb *ccb, int flag)
 struct gdt_softc {
 	struct	device sc_dev;
 	void   *sc_ih;
-	struct	scsi_link sc_link;	/* Virtual SCSI bus for cache devs */
 
 	int	sc_class;		/* Controller class */
 #define GDT_ISA		0x01
diff --git a/sys/dev/ic/iha.h b/sys/dev/ic/iha.h
index ffeb024b033..5eb5a7f9a93 100644
--- a/sys/dev/ic/iha.h
+++ b/sys/dev/ic/iha.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: iha.h,v 1.23 2020/07/02 13:08:33 krw Exp $ */
+/*	$OpenBSD: iha.h,v 1.24 2020/07/22 13:16:04 krw Exp $ */
 /*-------------------------------------------------------------------------
  *
  * Device driver for the INI-9XXXU/UW or INIC-940/950  PCI SCSI Controller.
@@ -133,7 +133,6 @@ struct iha_softc {
 	bus_dma_tag_t	     sc_dmat;
 	bus_dmamap_t	     sc_dmamap;
 
-	struct	scsi_link    sc_link;
 	u_int16_t	     sc_id;
 	u_int16_t	     sc_maxtargets;
 
diff --git a/sys/dev/ic/mfivar.h b/sys/dev/ic/mfivar.h
index e6d3c953414..de027e59cb7 100644
--- a/sys/dev/ic/mfivar.h
+++ b/sys/dev/ic/mfivar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: mfivar.h,v 1.54 2014/08/15 02:27:02 yasuoka Exp $ */
+/* $OpenBSD: mfivar.h,v 1.55 2020/07/22 13:16:04 krw Exp $ */
 /*
  * Copyright (c) 2006 Marco Peereboom <marco@peereboom.us>
  *
@@ -117,7 +117,6 @@ struct mfi_pd_link {
 };
 
 struct mfi_pd_softc {
-	struct scsi_link	pd_link;
 	struct scsibus_softc	*pd_scsibus;
 	struct mfi_pd_link	*pd_links[MFI_MAX_PD];
 };
@@ -125,7 +124,6 @@ struct mfi_pd_softc {
 struct mfi_softc {
 	struct device		sc_dev;
 	void			*sc_ih;
-	struct scsi_link	sc_link;
 	struct scsi_iopool	sc_iopool;
 
 	const struct mfi_iop_ops *sc_iop;
diff --git a/sys/dev/ic/mpivar.h b/sys/dev/ic/mpivar.h
index 644b11e2035..2435f8c343c 100644
--- a/sys/dev/ic/mpivar.h
+++ b/sys/dev/ic/mpivar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mpivar.h,v 1.40 2020/07/11 21:35:55 krw Exp $ */
+/*	$OpenBSD: mpivar.h,v 1.41 2020/07/22 13:16:04 krw Exp $ */
 
 /*
  * Copyright (c) 2005 David Gwynne <dlg@openbsd.org>
@@ -103,7 +103,6 @@ SLIST_HEAD(mpi_ccb_list, mpi_ccb);
 
 struct mpi_softc {
 	struct device		sc_dev;
-	struct scsi_link	sc_link;
 
 	u_int64_t		sc_port_wwn;
 	u_int64_t		sc_node_wwn;
diff --git a/sys/dev/ic/ncr53c9xvar.h b/sys/dev/ic/ncr53c9xvar.h
index e869c32d94d..bc701037711 100644
--- a/sys/dev/ic/ncr53c9xvar.h
+++ b/sys/dev/ic/ncr53c9xvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ncr53c9xvar.h,v 1.23 2014/01/18 23:09:04 dlg Exp $	*/
+/*	$OpenBSD: ncr53c9xvar.h,v 1.24 2020/07/22 13:16:04 krw Exp $	*/
 /*	$NetBSD: ncr53c9xvar.h,v 1.13 1998/05/26 23:17:34 thorpej Exp $	*/
 
 /*-
@@ -258,8 +258,6 @@ struct ncr53c9x_glue {
 struct ncr53c9x_softc {
 	struct device sc_dev;			/* us as a device */
 
-	struct scsi_link sc_link;		/* scsi link struct */
-
 	struct ncr53c9x_glue *sc_glue;		/* glue to MD code */
 
 	int	sc_ntarg;			/* number of targets */
diff --git a/sys/dev/ic/nvmevar.h b/sys/dev/ic/nvmevar.h
index 470dc0fc316..39cfda88b5c 100644
--- a/sys/dev/ic/nvmevar.h
+++ b/sys/dev/ic/nvmevar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nvmevar.h,v 1.19 2020/07/12 00:36:01 krw Exp $ */
+/*	$OpenBSD: nvmevar.h,v 1.20 2020/07/22 13:16:04 krw Exp $ */
 
 /*
  * Copyright (c) 2014 David Gwynne <dlg@openbsd.org>
@@ -100,8 +100,6 @@ struct nvme_softc {
 	struct nvme_ccb_list	sc_ccb_list;
 	struct nvme_dmamem	*sc_ccb_prpls;
 	struct scsi_iopool	sc_iopool;
-
-	struct scsi_link	sc_link;
 };
 
 int	nvme_attach(struct nvme_softc *);
diff --git a/sys/dev/ic/oosiopvar.h b/sys/dev/ic/oosiopvar.h
index 617673b198d..d1ad4290e5c 100644
--- a/sys/dev/ic/oosiopvar.h
+++ b/sys/dev/ic/oosiopvar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: oosiopvar.h,v 1.5 2011/04/03 12:42:36 krw Exp $ */
+/* $OpenBSD: oosiopvar.h,v 1.6 2020/07/22 13:16:04 krw Exp $ */
 /* $NetBSD: oosiopvar.h,v 1.2 2003/05/03 18:11:23 wiz Exp $ */
 
 /*
@@ -133,8 +133,6 @@ struct oosiop_softc {
 
 	struct oosiop_target sc_tgt[OOSIOP_NTGT];
 
-	struct scsi_link sc_link;
-
 	/* Lists of command blocks */
 	TAILQ_HEAD(oosiop_cb_queue, oosiop_cb) sc_free_cb,
 					       sc_cbq;
diff --git a/sys/dev/ic/osiopvar.h b/sys/dev/ic/osiopvar.h
index f55d26d8570..f776702212d 100644
--- a/sys/dev/ic/osiopvar.h
+++ b/sys/dev/ic/osiopvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: osiopvar.h,v 1.11 2010/06/28 04:39:57 dlg Exp $	*/
+/*	$OpenBSD: osiopvar.h,v 1.12 2020/07/22 13:16:04 krw Exp $	*/
 /*	$NetBSD: osiopvar.h,v 1.3 2002/05/14 02:58:35 matt Exp $	*/
 
 /*
@@ -216,7 +216,6 @@ struct osiop_softc {
 				        nexus_list;
 	struct mutex free_list_mtx;
 
-	struct scsi_link    sc_link;
 	struct scsi_iopool  sc_iopool;
 
 	struct osiop_tinfo sc_tinfo[OSIOP_NTGT];
diff --git a/sys/dev/ic/qlavar.h b/sys/dev/ic/qlavar.h
index d829cac594d..7b5be07902b 100644
--- a/sys/dev/ic/qlavar.h
+++ b/sys/dev/ic/qlavar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: qlavar.h,v 1.11 2017/06/05 04:57:37 dlg Exp $ */
+/*	$OpenBSD: qlavar.h,v 1.12 2020/07/22 13:16:04 krw Exp $ */
 
 /*
  * Copyright (c) 2013, 2014 Jonathan Matthew <jmatthew@openbsd.org>
@@ -124,8 +124,6 @@ struct qla_softc {
 	bus_size_t		sc_ios;
 	bus_dma_tag_t		sc_dmat;
 
-	struct scsi_link	sc_link;
-
 	struct scsibus_softc	*sc_scsibus;
 
 	enum qla_isp_type	sc_isp_type;
diff --git a/sys/dev/ic/qlwvar.h b/sys/dev/ic/qlwvar.h
index 6c6c3aab21a..b2691d5a3b8 100644
--- a/sys/dev/ic/qlwvar.h
+++ b/sys/dev/ic/qlwvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: qlwvar.h,v 1.10 2014/03/15 13:08:52 kettenis Exp $ */
+/*	$OpenBSD: qlwvar.h,v 1.11 2020/07/22 13:16:04 krw Exp $ */
 
 /*
  * Copyright (c) 2013, 2014 Jonathan Matthew <jmatthew@openbsd.org>
@@ -93,7 +93,6 @@ struct qlw_softc {
 	bus_size_t		sc_ios;
 	bus_dma_tag_t		sc_dmat;
 
-	struct scsi_link	sc_link[2];
 	struct scsibus_softc	*sc_scsibus[2];
 	int			sc_running;
 
diff --git a/sys/dev/ic/siopvar_common.h b/sys/dev/ic/siopvar_common.h
index 7940c5e8b82..07dc054576e 100644
--- a/sys/dev/ic/siopvar_common.h
+++ b/sys/dev/ic/siopvar_common.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: siopvar_common.h,v 1.31 2020/07/01 00:02:08 krw Exp $ */
+/*	$OpenBSD: siopvar_common.h,v 1.32 2020/07/22 13:16:04 krw Exp $ */
 /*	$NetBSD: siopvar_common.h,v 1.33 2005/11/18 23:10:32 bouyer Exp $ */
 
 /*
@@ -129,7 +129,6 @@ struct siop_common_target {
 /* Driver internal state */
 struct siop_common_softc {
 	struct device sc_dev;
-	struct scsi_link sc_link;	/* link to upper level */
 	u_int16_t sc_id;		/* adapter's target on bus */
 	int features;			/* chip's features */
 	int ram_size;
diff --git a/sys/dev/ic/trm.h b/sys/dev/ic/trm.h
index 027a57648d0..42f607ee33d 100644
--- a/sys/dev/ic/trm.h
+++ b/sys/dev/ic/trm.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: trm.h,v 1.6 2020/07/02 13:29:20 krw Exp $
+/*	$OpenBSD: trm.h,v 1.7 2020/07/22 13:16:04 krw Exp $
  * ------------------------------------------------------------
  *   O.S       : OpenBSD
  *   File Name : trm.h
@@ -210,13 +210,6 @@ struct trm_softc
 	u_int8_t	MsgCnt;
 	u_int8_t	MsgBuf[6];
 
-	/*
-	 *----------------------------------
-	 *    Link to the generic SCSI driver
-	 *----------------------------------
-	 */
-	struct	scsi_link	sc_link;
-
 	struct	SRB_HEAD	freeSRB;
 	struct	SRB_HEAD	goingSRB;
 	struct	SRB_HEAD	waitingSRB;
diff --git a/sys/dev/ic/twevar.h b/sys/dev/ic/twevar.h
index 8b34888991b..0142c626523 100644
--- a/sys/dev/ic/twevar.h
+++ b/sys/dev/ic/twevar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: twevar.h,v 1.13 2020/02/15 18:02:00 krw Exp $	*/
+/*	$OpenBSD: twevar.h,v 1.14 2020/07/22 13:16:04 krw Exp $	*/
 
 /*
  * Copyright (c) 2000 Michael Shalayeff
@@ -51,7 +51,6 @@ typedef TAILQ_HEAD(twe_queue_head, twe_ccb)	twe_queue_head;
 struct twe_softc {
 	struct device	sc_dev;
 	void		*sc_ih;
-	struct scsi_link sc_link;
 	struct proc	*sc_thread;
 	int		sc_thread_on;
 
diff --git a/sys/dev/ic/uhavar.h b/sys/dev/ic/uhavar.h
index 93d9896e516..3eb6ab93aab 100644
--- a/sys/dev/ic/uhavar.h
+++ b/sys/dev/ic/uhavar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uhavar.h,v 1.4 2011/04/03 12:42:36 krw Exp $	*/
+/*	$OpenBSD: uhavar.h,v 1.5 2020/07/22 13:16:04 krw Exp $	*/
 /*	$NetBSD: uhavar.h,v 1.3 1996/10/21 22:34:43 thorpej Exp $	*/
 
 /*
@@ -56,7 +56,6 @@ struct uha_softc {
 
 	int sc_nummscps;
 	int sc_scsi_dev;		/* our scsi id */
-	struct scsi_link sc_link;
 };
 
 void	uha_attach(struct uha_softc *);
diff --git a/sys/dev/isa/wds.c b/sys/dev/isa/wds.c
index 09565797ae5..2419ed0bbb9 100644
--- a/sys/dev/isa/wds.c
+++ b/sys/dev/isa/wds.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wds.c,v 1.54 2020/07/20 14:41:13 krw Exp $	*/
+/*	$OpenBSD: wds.c,v 1.55 2020/07/22 13:16:04 krw Exp $	*/
 /*	$NetBSD: wds.c,v 1.13 1996/11/03 16:20:31 mycroft Exp $	*/
 
 #undef	WDSDIAG
@@ -117,7 +117,6 @@ struct wds_softc {
 	TAILQ_HEAD(, wds_scb) sc_free_scb, sc_waiting_scb;
 	int sc_numscbs, sc_mbofull;
 	int sc_scsi_dev;
-	struct scsi_link sc_link;	/* prototype for subdevs */
 
 	struct mutex		sc_scb_mtx;
 	struct scsi_iopool	sc_iopool;
diff --git a/sys/dev/pci/arc.c b/sys/dev/pci/arc.c
index f80a9605ca3..e15b693f6b3 100644
--- a/sys/dev/pci/arc.c
+++ b/sys/dev/pci/arc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: arc.c,v 1.117 2020/07/20 14:41:13 krw Exp $ */
+/*	$OpenBSD: arc.c,v 1.118 2020/07/22 13:16:04 krw Exp $ */
 
 /*
  * Copyright (c) 2006 David Gwynne <dlg@openbsd.org>
@@ -543,7 +543,6 @@ struct arc_ccb {
 struct arc_softc {
 	struct device		sc_dev;
 	const struct arc_iop	*sc_iop;
-	struct scsi_link	sc_link;
 
 	pci_chipset_tag_t	sc_pc;
 	pcitag_t		sc_tag;
diff --git a/sys/dev/pci/ips.c b/sys/dev/pci/ips.c
index 1cae0d6d7ce..a40808d3d2b 100644
--- a/sys/dev/pci/ips.c
+++ b/sys/dev/pci/ips.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ips.c,v 1.125 2020/07/20 14:41:13 krw Exp $	*/
+/*	$OpenBSD: ips.c,v 1.126 2020/07/22 13:16:04 krw Exp $	*/
 
 /*
  * Copyright (c) 2006, 2007, 2009 Alexander Yurchenko <grange@openbsd.org>
@@ -383,15 +383,12 @@ struct dmamem {
 struct ips_softc {
 	struct device		sc_dev;
 
-	struct scsi_link	sc_scsi_link;
 	struct scsibus_softc *	sc_scsibus;
 
 	struct ips_pt {
 		struct ips_softc *	pt_sc;
 		int			pt_chan;
 
-		struct scsi_link	pt_link;
-
 		int			pt_proctgt;
 		char			pt_procdev[16];
 	}			sc_pt[IPS_MAXCHANS];
diff --git a/sys/dev/pci/mfii.c b/sys/dev/pci/mfii.c
index b63b840b16b..4701c139edd 100644
--- a/sys/dev/pci/mfii.c
+++ b/sys/dev/pci/mfii.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mfii.c,v 1.79 2020/07/20 14:41:13 krw Exp $ */
+/* $OpenBSD: mfii.c,v 1.80 2020/07/22 13:16:04 krw Exp $ */
 
 /*
  * Copyright (c) 2012 David Gwynne <dlg@openbsd.org>
@@ -241,7 +241,6 @@ struct mfii_pd_dev_handles {
 };
 
 struct mfii_pd_softc {
-	struct scsi_link	pd_link;
 	struct scsibus_softc	*pd_scsibus;
 	struct mfii_pd_dev_handles *pd_dev_handles;
 	uint8_t			pd_timeout;
@@ -300,7 +299,6 @@ struct mfii_softc {
 	struct mfii_ccb_list	sc_abort_list;
 	struct task		sc_abort_task;
 
-	struct scsi_link	sc_link;
 	struct scsibus_softc	*sc_scsibus;
 	struct mfii_pd_softc	*sc_pd;
 	struct scsi_iopool	sc_iopool;
diff --git a/sys/dev/pci/mpii.c b/sys/dev/pci/mpii.c
index 5ea23509e20..881a6f9f2c8 100644
--- a/sys/dev/pci/mpii.c
+++ b/sys/dev/pci/mpii.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mpii.c,v 1.137 2020/07/20 14:41:13 krw Exp $	*/
+/*	$OpenBSD: mpii.c,v 1.138 2020/07/22 13:16:04 krw Exp $	*/
 /*
  * Copyright (c) 2010, 2012 Mike Belopuhov
  * Copyright (c) 2009 James Giannoules
@@ -159,8 +159,6 @@ struct mpii_softc {
 
 	void			*sc_ih;
 
-	struct scsi_link	sc_link;
-
 	int			sc_flags;
 #define MPII_F_RAID		(1<<1)
 #define MPII_F_SAS3		(1<<2)
diff --git a/sys/dev/pci/qle.c b/sys/dev/pci/qle.c
index e39f6dd3cc6..cee23004f65 100644
--- a/sys/dev/pci/qle.c
+++ b/sys/dev/pci/qle.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: qle.c,v 1.59 2020/07/20 14:41:14 krw Exp $ */
+/*	$OpenBSD: qle.c,v 1.60 2020/07/22 13:16:05 krw Exp $ */
 
 /*
  * Copyright (c) 2013, 2014 Jonathan Matthew <jmatthew@openbsd.org>
@@ -164,8 +164,6 @@ struct qle_softc {
 	bus_size_t		sc_ios;
 	bus_dma_tag_t		sc_dmat;
 
-	struct scsi_link        sc_link;
-
 	struct scsibus_softc	*sc_scsibus;
 
 	enum qle_isp_type	sc_isp_type;
diff --git a/sys/dev/pci/vmwpvs.c b/sys/dev/pci/vmwpvs.c
index 5a7ff19f09c..e9b0876050f 100644
--- a/sys/dev/pci/vmwpvs.c
+++ b/sys/dev/pci/vmwpvs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vmwpvs.c,v 1.22 2020/07/20 14:41:14 krw Exp $ */
+/*	$OpenBSD: vmwpvs.c,v 1.23 2020/07/22 13:16:05 krw Exp $ */
 
 /*
  * Copyright (c) 2013 David Gwynne <dlg@openbsd.org>
@@ -321,7 +321,6 @@ struct vmwpvs_softc {
 
 	u_int			sc_bus_width;
 
-	struct scsi_link	sc_link;
 	struct scsi_iopool	sc_iopool;
 	struct scsibus_softc	*sc_scsibus;
 };
diff --git a/sys/dev/pv/hvs.c b/sys/dev/pv/hvs.c
index b1c74040666..a6d1c5864d9 100644
--- a/sys/dev/pv/hvs.c
+++ b/sys/dev/pv/hvs.c
@@ -215,7 +215,6 @@ struct hvs_softc {
 	int			 sc_initiator;
 
 	struct scsi_iopool	 sc_iopool;
-	struct scsi_link         sc_link;
 	struct device		*sc_scsibus;
 	struct task		 sc_probetask;
 };
diff --git a/sys/dev/pv/vioblk.c b/sys/dev/pv/vioblk.c
index f177c9a395e..ea6cc4a528a 100644
--- a/sys/dev/pv/vioblk.c
+++ b/sys/dev/pv/vioblk.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vioblk.c,v 1.25 2020/07/20 14:41:14 krw Exp $	*/
+/*	$OpenBSD: vioblk.c,v 1.26 2020/07/22 13:16:05 krw Exp $	*/
 
 /*
  * Copyright (c) 2012 Stefan Fritsch.
@@ -109,7 +109,6 @@ struct vioblk_softc {
 	bus_dma_segment_t        sc_reqs_segs[1];
 	int			 sc_nreqs;
 
-	struct scsi_link	 sc_link;
 	struct scsi_iopool	 sc_iopool;
 	struct mutex		 sc_vr_mtx;
 	SLIST_HEAD(, virtio_blk_req) sc_freelist;
diff --git a/sys/dev/pv/vioscsi.c b/sys/dev/pv/vioscsi.c
index d4ad1e3e59b..85a3f996ffc 100644
--- a/sys/dev/pv/vioscsi.c
+++ b/sys/dev/pv/vioscsi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vioscsi.c,v 1.24 2020/07/20 14:41:14 krw Exp $	*/
+/*	$OpenBSD: vioscsi.c,v 1.25 2020/07/22 13:16:05 krw Exp $	*/
 /*
  * Copyright (c) 2013 Google Inc.
  *
@@ -49,7 +49,6 @@ struct vioscsi_req {
 
 struct vioscsi_softc {
 	struct device		 sc_dev;
-	struct scsi_link	 sc_link;
 	struct scsi_iopool	 sc_iopool;
 	struct mutex		 sc_vr_mtx;
 
diff --git a/sys/dev/pv/xbf.c b/sys/dev/pv/xbf.c
index f47533afd3f..e247c2c8f9d 100644
--- a/sys/dev/pv/xbf.c
+++ b/sys/dev/pv/xbf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: xbf.c,v 1.43 2020/07/20 14:41:14 krw Exp $	*/
+/*	$OpenBSD: xbf.c,v 1.44 2020/07/22 13:16:05 krw Exp $	*/
 
 /*
  * Copyright (c) 2016, 2017 Mike Belopuhov
@@ -201,7 +201,6 @@ struct xbf_softc {
 	struct mutex		 sc_ccb_sqlck;
 
 	struct scsi_iopool	 sc_iopool;
-	struct scsi_link         sc_link;
 	struct device		*sc_scsibus;
 };
 
diff --git a/sys/dev/sdmmc/sdmmc_scsi.c b/sys/dev/sdmmc/sdmmc_scsi.c
index 76d1c7f1957..a6f577fb36d 100644
--- a/sys/dev/sdmmc/sdmmc_scsi.c
+++ b/sys/dev/sdmmc/sdmmc_scsi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sdmmc_scsi.c,v 1.51 2020/07/20 14:41:14 krw Exp $	*/
+/*	$OpenBSD: sdmmc_scsi.c,v 1.52 2020/07/22 13:16:05 krw Exp $	*/
 
 /*
  * Copyright (c) 2006 Uwe Stuehler <uwe@openbsd.org>
@@ -68,7 +68,6 @@ struct sdmmc_ccb {
 TAILQ_HEAD(sdmmc_ccb_list, sdmmc_ccb);
 
 struct sdmmc_scsi_softc {
-	struct scsi_link sc_link;
 	struct device *sc_child;
 	struct sdmmc_scsi_target *sc_tgt;
 	int sc_ntargets;
diff --git a/sys/dev/softraidvar.h b/sys/dev/softraidvar.h
index 0ac90d16d1a..54909577ab7 100644
--- a/sys/dev/softraidvar.h
+++ b/sys/dev/softraidvar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: softraidvar.h,v 1.170 2020/02/13 15:11:32 krw Exp $ */
+/* $OpenBSD: softraidvar.h,v 1.171 2020/07/22 13:16:04 krw Exp $ */
 /*
  * Copyright (c) 2006 Marco Peereboom <marco@peereboom.us>
  * Copyright (c) 2008 Chris Kuethe <ckuethe@openbsd.org>
@@ -625,7 +625,6 @@ struct sr_softc {
 	struct ksensordev	sc_sensordev;
 	struct sensor_task	*sc_sensor_task;
 
-	struct scsi_link	sc_link;	/* scsi prototype link */
 	struct scsibus_softc	*sc_scsibus;
 
 	/* The target lookup has to be cheap since it happens for each I/O. */
diff --git a/sys/dev/usb/umass_scsi.c b/sys/dev/usb/umass_scsi.c
index de85138e602..7177e403947 100644
--- a/sys/dev/usb/umass_scsi.c
+++ b/sys/dev/usb/umass_scsi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: umass_scsi.c,v 1.57 2020/07/20 14:41:14 krw Exp $ */
+/*	$OpenBSD: umass_scsi.c,v 1.58 2020/07/22 13:16:05 krw Exp $ */
 /*	$NetBSD: umass_scsipi.c,v 1.9 2003/02/16 23:14:08 augustss Exp $	*/
 /*
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -53,7 +53,6 @@
 
 struct umass_scsi_softc {
 	struct device		*sc_child;
-	struct scsi_link	sc_link;
 	struct scsi_iopool	sc_iopool;
 	int			sc_open;
 
diff --git a/sys/dev/vscsi.c b/sys/dev/vscsi.c
index 5b8faa11a0d..a98519e72c2 100644
--- a/sys/dev/vscsi.c
+++ b/sys/dev/vscsi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vscsi.c,v 1.55 2020/07/20 14:41:12 krw Exp $ */
+/*	$OpenBSD: vscsi.c,v 1.56 2020/07/22 13:16:04 krw Exp $ */
 
 /*
  * Copyright (c) 2008 David Gwynne <dlg@openbsd.org>
@@ -56,7 +56,6 @@ enum vscsi_state {
 
 struct vscsi_softc {
 	struct device		sc_dev;
-	struct scsi_link	sc_link;
 	struct scsibus_softc	*sc_scsibus;
 
 	struct mutex		sc_state_mtx;
diff --git a/sys/scsi/mpath.c b/sys/scsi/mpath.c
index 68676524f69..a757dc7b986 100644
--- a/sys/scsi/mpath.c
+++ b/sys/scsi/mpath.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mpath.c,v 1.52 2020/07/20 14:41:14 krw Exp $ */
+/*	$OpenBSD: mpath.c,v 1.53 2020/07/22 13:16:05 krw Exp $ */
 
 /*
  * Copyright (c) 2009 David Gwynne <dlg@openbsd.org>
@@ -66,7 +66,6 @@ struct mpath_dev {
 
 struct mpath_softc {
 	struct device		sc_dev;
-	struct scsi_link	sc_link;
 	struct scsibus_softc	*sc_scsibus;
 	struct mpath_dev	*sc_devs[MPATH_BUSWIDTH];
 };