Use a consistant idiom/format when declaring scsi_adapter structures

in drivers. Terse one liners, NULLs instead of 0's, explicitly specify
all members, etc.

Nuke #ifdef notyet blocks related to the scsi_adapter in aic.

No intentional functional change.

ok tedu@

37 files changed, 81 insertions, 232 deletions

diff --git a/sys/arch/luna88k/dev/spc.c b/sys/arch/luna88k/dev/spc.c
index 93c9f0bbb2c..679d388c4b3 100644
--- a/sys/arch/luna88k/dev/spc.c
+++ b/sys/arch/luna88k/dev/spc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: spc.c,v 1.9 2017/03/16 18:13:44 miod Exp $ */
+/* $OpenBSD: spc.c,v 1.10 2020/01/23 07:52:59 krw Exp $ */
 /* $NetBSD: spc.c,v 1.4 2003/07/05 19:00:17 tsutsui Exp $ */
 
 /*-
@@ -60,10 +60,7 @@ struct cfdriver spc_cd = {
 };
 
 struct scsi_adapter spc_switch = {
-	spc_scsi_cmd,
-	scsi_minphys,		/* no max at this level; handled by DMA code */
-	NULL,
-	NULL,
+	spc_scsi_cmd, scsi_minphys, NULL, NULL, NULL
 };
 
 /* bus space tag for spc */
diff --git a/sys/arch/macppc/dev/mesh.c b/sys/arch/macppc/dev/mesh.c
index aa66f477493..806ff63a6ad 100644
--- a/sys/arch/macppc/dev/mesh.c
+++ b/sys/arch/macppc/dev/mesh.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mesh.c,v 1.35 2019/09/03 12:13:41 kettenis Exp $	*/
+/*	$OpenBSD: mesh.c,v 1.36 2020/01/23 07:52:59 krw Exp $	*/
 /*	$NetBSD: mesh.c,v 1.1 1999/02/19 13:06:03 tsubai Exp $	*/
 
 /*-
@@ -256,7 +256,7 @@ struct cfdriver mesh_cd = {
 };
 
 struct scsi_adapter mesh_switch = {
-	mesh_scsi_cmd, mesh_minphys, NULL, NULL
+	mesh_scsi_cmd, mesh_minphys, NULL, NULL, NULL
 };
 
 #define MESH_DATAOUT	0
diff --git a/sys/arch/sgi/hpc/wdsc.c b/sys/arch/sgi/hpc/wdsc.c
index e8422e5bbde..6cff31db176 100644
--- a/sys/arch/sgi/hpc/wdsc.c
+++ b/sys/arch/sgi/hpc/wdsc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wdsc.c,v 1.5 2014/06/27 17:51:08 miod Exp $	*/
+/*	$OpenBSD: wdsc.c,v 1.6 2020/01/23 07:52:59 krw Exp $	*/
 /*	$NetBSD: wdsc.c,v 1.32 2011/07/01 18:53:47 dyoung Exp $	*/
 
 /*
@@ -85,10 +85,7 @@ void	wdsc_dmastop(struct wd33c93_softc *);
 void	wdsc_reset(struct wd33c93_softc *);
 
 struct scsi_adapter wdsc_switch = {
-	wd33c93_scsi_cmd,
-	scsi_minphys,
-	NULL,
-	NULL,
+	wd33c93_scsi_cmd, scsi_minphys, NULL, NULL, NULL
 };
 
 /*
diff --git a/sys/dev/ata/atascsi.c b/sys/dev/ata/atascsi.c
index e07a8d8fab4..f1ae3de98a5 100644
--- a/sys/dev/ata/atascsi.c
+++ b/sys/dev/ata/atascsi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: atascsi.c,v 1.130 2019/08/19 17:16:55 krw Exp $ */
+/*	$OpenBSD: atascsi.c,v 1.131 2020/01/23 07:52:59 krw Exp $ */
 
 /*
  * Copyright (c) 2007 David Gwynne <dlg@openbsd.org>
@@ -96,11 +96,7 @@ void		atascsi_free(struct scsi_link *);
 
 /* template */
 struct scsi_adapter atascsi_switch = {
-	atascsi_cmd,		/* scsi_cmd */
-	scsi_minphys,		/* scsi_minphys */
-	atascsi_probe,		/* dev_probe */
-	atascsi_free,		/* dev_free */
-	NULL,			/* ioctl */
+	atascsi_cmd, scsi_minphys, atascsi_probe, atascsi_free, NULL
 };
 
 void		ata_swapcopy(void *, void *, size_t);
diff --git a/sys/dev/atapiscsi/atapiscsi.c b/sys/dev/atapiscsi/atapiscsi.c
index 724782f9945..e33178b85eb 100644
--- a/sys/dev/atapiscsi/atapiscsi.c
+++ b/sys/dev/atapiscsi/atapiscsi.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: atapiscsi.c,v 1.106 2017/12/30 20:46:59 guenther Exp $     */
+/*      $OpenBSD: atapiscsi.c,v 1.107 2020/01/23 07:52:59 krw Exp $     */
 
 /*
  * This code is derived from code with the copyright below.
@@ -159,13 +159,8 @@ void  wdc_atapi_minphys(struct buf *bp, struct scsi_link *sl);
 int   wdc_atapi_ioctl(struct scsi_link *, u_long, caddr_t, int);
 void  wdc_atapi_send_cmd(struct scsi_xfer *sc_xfer);
 
-static struct scsi_adapter atapiscsi_switch =
-{
-	wdc_atapi_send_cmd,
-	wdc_atapi_minphys,
-	NULL,
-	NULL,
-	wdc_atapi_ioctl
+static struct scsi_adapter atapiscsi_switch = {
+	wdc_atapi_send_cmd, wdc_atapi_minphys, NULL, NULL, wdc_atapi_ioctl
 };
 
 /* Inital version shares bus_link structure so it can easily
diff --git a/sys/dev/ic/aac.c b/sys/dev/ic/aac.c
index bc4d5f0ca1d..6ec520de0a2 100644
--- a/sys/dev/ic/aac.c
+++ b/sys/dev/ic/aac.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: aac.c,v 1.72 2020/01/15 16:50:29 cheloha Exp $	*/
+/*	$OpenBSD: aac.c,v 1.73 2020/01/23 07:52:59 krw Exp $	*/
 
 /*-
  * Copyright (c) 2000 Michael Smith
@@ -130,11 +130,7 @@ struct cfdriver aac_cd = {
 };
 
 struct scsi_adapter aac_switch = {
-	aac_scsi_cmd,
-	scsi_minphys,
-	NULL,		/* probe */
-	NULL,		/* free */
-	NULL		/* ioctl */
+	aac_scsi_cmd, scsi_minphys, NULL, NULL, NULL
 };
 
 /* Falcon/PPC interface */
diff --git a/sys/dev/ic/adv.c b/sys/dev/ic/adv.c
index 4456418104b..158861ebaad 100644
--- a/sys/dev/ic/adv.c
+++ b/sys/dev/ic/adv.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: adv.c,v 1.37 2017/09/08 05:36:52 deraadt Exp $	*/
+/*	$OpenBSD: adv.c,v 1.38 2020/01/23 07:52:59 krw Exp $	*/
 /*	$NetBSD: adv.c,v 1.6 1998/10/28 20:39:45 dante Exp $	*/
 
 /*
@@ -82,12 +82,8 @@ struct cfdriver adv_cd = {
 };
 
 
-struct scsi_adapter adv_switch =
-{
-	adv_scsi_cmd,		/* called to start/enqueue a SCSI command */
-	advminphys,		/* to limit the transfer to max device can do */
-	0,			/* IT SEEMS IT IS NOT USED YET */
-	0,			/* as above... */
+struct scsi_adapter adv_switch = {
+	adv_scsi_cmd, advminphys, NULL, NULL, NULL
 };
 
 
diff --git a/sys/dev/ic/aic6250.c b/sys/dev/ic/aic6250.c
index cf573926e89..144cc371d36 100644
--- a/sys/dev/ic/aic6250.c
+++ b/sys/dev/ic/aic6250.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: aic6250.c,v 1.5 2018/10/22 17:31:25 krw Exp $	*/
+/*	$OpenBSD: aic6250.c,v 1.6 2020/01/23 07:52:59 krw Exp $	*/
 
 /*
  * Copyright (c) 2010, 2013 Miodrag Vallat.
@@ -132,7 +132,6 @@
 int aic6250_debug = 0x00; /* AIC_SHOWSTART|AIC_SHOWMISC|AIC_SHOWTRACE; */
 #endif
 
-void	aic6250_minphys(struct buf *, struct scsi_link *);
 void 	aic6250_init(struct aic6250_softc *);
 void	aic6250_done(struct aic6250_softc *, struct aic6250_acb *);
 void	aic6250_dequeue(struct aic6250_softc *, struct aic6250_acb *);
@@ -168,12 +167,7 @@ struct cfdriver oaic_cd = {
 };
 
 struct scsi_adapter aic6250_switch = {
-	.scsi_cmd = aic6250_scsi_cmd,
-#ifdef notyet
-	.scsi_minphys = aic6250_minphys,
-#else
-	.scsi_minphys = scsi_minphys,
-#endif
+	aic6250_scsi_cmd, scsi_minphys, NULL, NULL, NULL
 };
 
 /*
@@ -441,21 +435,6 @@ aic6250_scsi_cmd(struct scsi_xfer *xs)
 	}
 }
 
-#ifdef notyet
-/*
- * Adjust transfer size in buffer structure
- */
-void
-aic6250_minphys(struct buf *bp, struct scsi_link *sl)
-{
-
-	AIC_TRACE(("aic6250_minphys  "));
-	if (bp->b_bcount > (AIC_NSEG << PGSHIFT))
-		bp->b_bcount = (AIC_NSEG << PGSHIFT);
-	minphys(bp);
-}
-#endif
-
 /*
  * Used when interrupt driven I/O isn't allowed, e.g. during boot.
  */
diff --git a/sys/dev/ic/aic6360.c b/sys/dev/ic/aic6360.c
index 46da32e9007..d818d5775c3 100644
--- a/sys/dev/ic/aic6360.c
+++ b/sys/dev/ic/aic6360.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: aic6360.c,v 1.29 2017/09/08 05:36:52 deraadt Exp $	*/
+/*	$OpenBSD: aic6360.c,v 1.30 2020/01/23 07:52:59 krw Exp $	*/
 /*	$NetBSD: aic6360.c,v 1.52 1996/12/10 21:27:51 thorpej Exp $	*/
 
 #ifdef DDB
@@ -151,7 +151,6 @@
 int aic_debug = 0x00; /* AIC_SHOWSTART|AIC_SHOWMISC|AIC_SHOWTRACE; */
 #endif
 
-void	aic_minphys(struct buf *, struct scsi_link *);
 void 	aic_init(struct aic_softc *);
 void	aic_done(struct aic_softc *, struct aic_acb *);
 void	aic_dequeue(struct aic_softc *, struct aic_acb *);
@@ -186,14 +185,7 @@ struct cfdriver aic_cd = {
 };
 
 struct scsi_adapter aic_switch = {
-	aic_scsi_cmd,
-#ifdef notyet
-	aic_minphys,
-#else
-	scsi_minphys,
-#endif
-	0,
-	0,
+	aic_scsi_cmd, scsi_minphys, NULL, NULL, NULL
 };
 
 /*
@@ -536,21 +528,6 @@ aic_scsi_cmd(struct scsi_xfer *xs)
 	}
 }
 
-#ifdef notyet
-/*
- * Adjust transfer size in buffer structure
- */
-void
-aic_minphys(struct buf *bp, struct scsi_link *sl)
-{
-
-	AIC_TRACE(("aic_minphys  "));
-	if (bp->b_bcount > (AIC_NSEG << PGSHIFT))
-		bp->b_bcount = (AIC_NSEG << PGSHIFT);
-	minphys(bp);
-}
-#endif
-
 /*
  * Used when interrupt driven I/O isn't allowed, e.g. during boot.
  */
diff --git a/sys/dev/ic/aic79xx_openbsd.c b/sys/dev/ic/aic79xx_openbsd.c
index 58ec444d579..b14409805be 100644
--- a/sys/dev/ic/aic79xx_openbsd.c
+++ b/sys/dev/ic/aic79xx_openbsd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: aic79xx_openbsd.c,v 1.46 2017/12/12 12:33:36 krw Exp $	*/
+/*	$OpenBSD: aic79xx_openbsd.c,v 1.47 2020/01/23 07:53:00 krw Exp $	*/
 
 /*
  * Copyright (c) 2004 Milos Urbanek, Kenneth R. Westerback & Marco Peereboom
@@ -84,10 +84,7 @@ struct cfdriver ahd_cd = {
 
 static struct scsi_adapter ahd_switch =
 {
-	ahd_action,
-	ahd_minphys,
-	0,
-	0,
+	ahd_action, ahd_minphys, NULL, NULL, NULL
 };
 
 /*
diff --git a/sys/dev/ic/aic7xxx_openbsd.c b/sys/dev/ic/aic7xxx_openbsd.c
index 147a44035fb..83721c43133 100644
--- a/sys/dev/ic/aic7xxx_openbsd.c
+++ b/sys/dev/ic/aic7xxx_openbsd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: aic7xxx_openbsd.c,v 1.56 2017/12/12 12:33:36 krw Exp $	*/
+/*	$OpenBSD: aic7xxx_openbsd.c,v 1.57 2020/01/23 07:53:00 krw Exp $	*/
 /*	$NetBSD: aic7xxx_osm.c,v 1.14 2003/11/02 11:07:44 wiz Exp $	*/
 
 /*
@@ -63,10 +63,7 @@ struct cfdriver ahc_cd = {
 
 static struct scsi_adapter ahc_switch =
 {
-	ahc_action,
-	ahc_minphys,
-	0,
-	0,
+	ahc_action, ahc_minphys, NULL, NULL, NULL
 };
 
 /*
diff --git a/sys/dev/ic/ami.c b/sys/dev/ic/ami.c
index 2c73c419ec8..d9f8e8f128e 100644
--- a/sys/dev/ic/ami.c
+++ b/sys/dev/ic/ami.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ami.c,v 1.237 2020/01/11 21:38:11 cheloha Exp $	*/
+/*	$OpenBSD: ami.c,v 1.238 2020/01/23 07:53:00 krw Exp $	*/
 
 /*
  * Copyright (c) 2001 Michael Shalayeff
@@ -98,13 +98,13 @@ int	ami_scsi_ioctl(struct scsi_link *, u_long, caddr_t, int);
 void	amiminphys(struct buf *bp, struct scsi_link *sl);
 
 struct scsi_adapter ami_switch = {
-	ami_scsi_cmd, amiminphys, 0, 0, ami_scsi_ioctl
+	ami_scsi_cmd, amiminphys, NULL, NULL, ami_scsi_ioctl
 };
 
 void	ami_scsi_raw_cmd(struct scsi_xfer *);
 
 struct scsi_adapter ami_raw_switch = {
-	ami_scsi_raw_cmd, amiminphys, 0, 0,
+	ami_scsi_raw_cmd, amiminphys, NULL, NULL, NULL
 };
 
 void *		ami_get_ccb(void *);
diff --git a/sys/dev/ic/cac.c b/sys/dev/ic/cac.c
index 50f64e4f8cc..53b3151f33c 100644
--- a/sys/dev/ic/cac.c
+++ b/sys/dev/ic/cac.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cac.c,v 1.55 2015/09/01 05:46:00 deraadt Exp $	*/
+/*	$OpenBSD: cac.c,v 1.56 2020/01/23 07:53:00 krw Exp $	*/
 /*	$NetBSD: cac.c,v 1.15 2000/11/08 19:20:35 ad Exp $	*/
 
 /*
@@ -99,7 +99,7 @@ void    cac_scsi_cmd(struct scsi_xfer *);
 void	cacminphys(struct buf *bp, struct scsi_link *sl);
 
 struct scsi_adapter cac_switch = {
-	cac_scsi_cmd, cacminphys, 0, 0,
+	cac_scsi_cmd, cacminphys, NULL, NULL, NULL
 };
 
 void	*cac_ccb_alloc(void *);
diff --git a/sys/dev/ic/gdt_common.c b/sys/dev/ic/gdt_common.c
index f57e1e79e46..b10bc1e7a51 100644
--- a/sys/dev/ic/gdt_common.c
+++ b/sys/dev/ic/gdt_common.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: gdt_common.c,v 1.64 2018/08/14 05:22:21 jmatthew Exp $	*/
+/*	$OpenBSD: gdt_common.c,v 1.65 2020/01/23 07:53:00 krw Exp $	*/
 
 /*
  * Copyright (c) 1999, 2000, 2003 Niklas Hallqvist.  All rights reserved.
@@ -93,7 +93,7 @@ struct cfdriver gdt_cd = {
 };
 
 struct scsi_adapter gdt_switch = {
-	gdt_scsi_cmd, gdtminphys, 0, 0,
+	gdt_scsi_cmd, gdtminphys, NULL, NULL, NULL
 };
 
 int gdt_cnt = 0;
diff --git a/sys/dev/ic/iha.c b/sys/dev/ic/iha.c
index 9f40667c64a..1faa5872c57 100644
--- a/sys/dev/ic/iha.c
+++ b/sys/dev/ic/iha.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: iha.c,v 1.43 2015/03/14 03:38:47 jsg Exp $ */
+/*	$OpenBSD: iha.c,v 1.44 2020/01/23 07:53:00 krw Exp $ */
 /*-------------------------------------------------------------------------
  *
  * Device driver for the INI-9XXXU/UW or INIC-940/950  PCI SCSI Controller.
@@ -53,10 +53,7 @@ struct cfdriver iha_cd = {
 };
 
 struct scsi_adapter iha_switch = {
-	iha_scsi_cmd,	/* scsi_cmd() */
-	iha_minphys,	/* scsi_minphys() */
-	NULL,		/* probe_dev(void) */
-	NULL		/* free_dev() */
+	iha_scsi_cmd, iha_minphys, NULL, NULL, NULL
 };
 
 /*
diff --git a/sys/dev/ic/mfi.c b/sys/dev/ic/mfi.c
index 5635204f753..d7e4d7de544 100644
--- a/sys/dev/ic/mfi.c
+++ b/sys/dev/ic/mfi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mfi.c,v 1.171 2019/12/31 10:05:32 mpi Exp $ */
+/* $OpenBSD: mfi.c,v 1.172 2020/01/23 07:53:00 krw Exp $ */
 /*
  * Copyright (c) 2006 Marco Peereboom <marco@peereboom.us>
  *
@@ -64,15 +64,11 @@ void	mfi_pd_scsi_cmd(struct scsi_xfer *);
 int	mfi_pd_scsi_probe(struct scsi_link *);
 
 struct scsi_adapter mfi_switch = {
-	mfi_scsi_cmd, mfiminphys, 0, 0, mfi_scsi_ioctl
+	mfi_scsi_cmd, mfiminphys, NULL, NULL, mfi_scsi_ioctl
 };
 
 struct scsi_adapter mfi_pd_switch = {
-	mfi_pd_scsi_cmd,
-	mfiminphys,
-	mfi_pd_scsi_probe,
-	0,
-	mfi_scsi_ioctl
+	mfi_pd_scsi_cmd, mfiminphys, mfi_pd_scsi_probe, NULL, mfi_scsi_ioctl
 };
 
 void *		mfi_get_ccb(void *);
diff --git a/sys/dev/ic/mpi.c b/sys/dev/ic/mpi.c
index a8000dd484e..621ab62a421 100644
--- a/sys/dev/ic/mpi.c
+++ b/sys/dev/ic/mpi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mpi.c,v 1.208 2019/12/31 10:05:32 mpi Exp $ */
+/*	$OpenBSD: mpi.c,v 1.209 2020/01/23 07:53:00 krw Exp $ */
 
 /*
  * Copyright (c) 2005, 2006, 2009 David Gwynne <dlg@openbsd.org>
@@ -70,11 +70,7 @@ int			mpi_scsi_ioctl(struct scsi_link *, u_long, caddr_t,
 			    int);
 
 struct scsi_adapter mpi_switch = {
-	mpi_scsi_cmd,
-	mpi_minphys,
-	mpi_scsi_probe,
-	NULL,
-	mpi_scsi_ioctl
+	mpi_scsi_cmd, mpi_minphys, mpi_scsi_probe, NULL, mpi_scsi_ioctl
 };
 
 struct mpi_dmamem	*mpi_dmamem_alloc(struct mpi_softc *, size_t);
diff --git a/sys/dev/ic/ncr53c9x.c b/sys/dev/ic/ncr53c9x.c
index 509171ebaf3..924b669148f 100644
--- a/sys/dev/ic/ncr53c9x.c
+++ b/sys/dev/ic/ncr53c9x.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ncr53c9x.c,v 1.65 2019/05/07 14:22:06 cheloha Exp $	*/
+/*	$OpenBSD: ncr53c9x.c,v 1.66 2020/01/23 07:53:00 krw Exp $	*/
 /*     $NetBSD: ncr53c9x.c,v 1.56 2000/11/30 14:41:46 thorpej Exp $    */
 
 /*
@@ -150,11 +150,8 @@ int	ncr53c9x_scsi_probe(struct scsi_link *);
 void	ncr53c9x_scsi_free(struct scsi_link *);
 
 struct scsi_adapter ncr53c9x_adapter = {
-	ncr53c9x_scsi_cmd,	/* cmd */
-	scsi_minphys,		/* minphys */
-	ncr53c9x_scsi_probe,	/* lun probe */
-	ncr53c9x_scsi_free,	/* lun free */
-	NULL			/* ioctl */
+	ncr53c9x_scsi_cmd, scsi_minphys, ncr53c9x_scsi_probe,
+	ncr53c9x_scsi_free, NULL
 };
 
 /*
diff --git a/sys/dev/ic/nvme.c b/sys/dev/ic/nvme.c
index 98f4a8e5d5c..4fbe81185f8 100644
--- a/sys/dev/ic/nvme.c
+++ b/sys/dev/ic/nvme.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nvme.c,v 1.63 2019/07/27 13:20:12 kettenis Exp $ */
+/*	$OpenBSD: nvme.c,v 1.64 2020/01/23 07:53:00 krw Exp $ */
 
 /*
  * Copyright (c) 2014 David Gwynne <dlg@openbsd.org>
@@ -98,11 +98,7 @@ int	nvme_hibernate_io(dev_t, daddr_t, vaddr_t, size_t, int, void *);
 #endif
 
 struct scsi_adapter nvme_switch = {
-	nvme_scsi_cmd,		/* cmd */
-	scsi_minphys,		/* minphys */
-	nvme_scsi_probe,	/* dev probe */
-	nvme_scsi_free,		/* dev free */
-	NULL,			/* ioctl */
+	nvme_scsi_cmd, scsi_minphys, nvme_scsi_probe, nvme_scsi_free, NULL
 };
 
 void	nvme_scsi_io(struct scsi_xfer *, int);
diff --git a/sys/dev/ic/oosiop.c b/sys/dev/ic/oosiop.c
index 00d0a58b976..fe2647a2532 100644
--- a/sys/dev/ic/oosiop.c
+++ b/sys/dev/ic/oosiop.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: oosiop.c,v 1.22 2014/07/13 23:10:23 deraadt Exp $	*/
+/*	$OpenBSD: oosiop.c,v 1.23 2020/01/23 07:53:00 krw Exp $	*/
 /*	$NetBSD: oosiop.c,v 1.4 2003/10/29 17:45:55 tsutsui Exp $	*/
 
 /*
@@ -130,10 +130,7 @@ struct cfdriver oosiop_cd = {
 };
 
 struct scsi_adapter oosiop_adapter = {
-	oosiop_scsicmd,
-	oosiop_minphys,
-	NULL,
-	NULL
+	oosiop_scsicmd, oosiop_minphys, NULL, NULL, NULL
 };
 
 void *
diff --git a/sys/dev/ic/osiop.c b/sys/dev/ic/osiop.c
index 07fa9131676..cac4844df05 100644
--- a/sys/dev/ic/osiop.c
+++ b/sys/dev/ic/osiop.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: osiop.c,v 1.51 2017/04/30 16:45:46 mpi Exp $	*/
+/*	$OpenBSD: osiop.c,v 1.52 2020/01/23 07:53:00 krw Exp $	*/
 /*	$NetBSD: osiop.c,v 1.9 2002/04/05 18:27:54 bouyer Exp $	*/
 
 /*
@@ -181,10 +181,7 @@ struct cfdriver osiop_cd = {
 };
 
 struct scsi_adapter osiop_adapter = {
-	osiop_scsicmd,
-	osiop_minphys,
-	NULL,
-	NULL,
+	osiop_scsicmd, osiop_minphys, NULL, NULL, NULL
 };
 
 void
diff --git a/sys/dev/ic/qla.c b/sys/dev/ic/qla.c
index f0f9aec9342..82cd75729bf 100644
--- a/sys/dev/ic/qla.c
+++ b/sys/dev/ic/qla.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: qla.c,v 1.58 2019/12/31 22:57:07 jsg Exp $ */
+/*	$OpenBSD: qla.c,v 1.59 2020/01/23 07:53:00 krw Exp $ */
 
 /*
  * Copyright (c) 2011 David Gwynne <dlg@openbsd.org>
@@ -170,11 +170,7 @@ static const struct qla_regs qla_regs_23XX = {
     ((*(_sc)->sc_regs->read_isr)((_sc), (_isr), (_info)))
 
 struct scsi_adapter qla_switch = {
-	qla_scsi_cmd,
-	scsi_minphys,
-	qla_scsi_probe,
-	NULL,	/* scsi_free */
-	NULL	/* ioctl */
+	qla_scsi_cmd, scsi_minphys, qla_scsi_probe, NULL, NULL
 };
 
 int
diff --git a/sys/dev/ic/qlw.c b/sys/dev/ic/qlw.c
index a1e37e18525..42ebc3b587e 100644
--- a/sys/dev/ic/qlw.c
+++ b/sys/dev/ic/qlw.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: qlw.c,v 1.32 2019/12/31 10:05:32 mpi Exp $ */
+/*	$OpenBSD: qlw.c,v 1.33 2020/01/23 07:53:00 krw Exp $ */
 
 /*
  * Copyright (c) 2011 David Gwynne <dlg@openbsd.org>
@@ -164,11 +164,7 @@ qlw_queue_write(struct qlw_softc *sc, bus_size_t offset, u_int16_t value)
 }
 
 struct scsi_adapter qlw_switch = {
-	qlw_scsi_cmd,
-	scsi_minphys,
-	qlw_scsi_probe,
-	NULL,	/* scsi_free */
-	NULL	/* ioctl */
+	qlw_scsi_cmd, scsi_minphys, qlw_scsi_probe, NULL, NULL
 };
 
 int
diff --git a/sys/dev/ic/siop.c b/sys/dev/ic/siop.c
index b7dbbd41802..efc3228bd4c 100644
--- a/sys/dev/ic/siop.c
+++ b/sys/dev/ic/siop.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: siop.c,v 1.71 2015/09/09 18:24:26 deraadt Exp $ */
+/*	$OpenBSD: siop.c,v 1.72 2020/01/23 07:53:00 krw Exp $ */
 /*	$NetBSD: siop.c,v 1.79 2005/11/18 23:10:32 bouyer Exp $	*/
 
 /*
@@ -104,10 +104,7 @@ struct cfdriver siop_cd = {
 };
 
 struct scsi_adapter siop_adapter = {
-	siop_scsicmd,
-	siop_minphys,
-	siop_scsiprobe,
-	siop_scsifree
+	siop_scsicmd, siop_minphys, siop_scsiprobe, siop_scsifree, NULL
 };
 
 #ifdef SIOP_STATS
diff --git a/sys/dev/ic/trm.c b/sys/dev/ic/trm.c
index 2fd1a122d9a..09839b02d73 100644
--- a/sys/dev/ic/trm.c
+++ b/sys/dev/ic/trm.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: trm.c,v 1.33 2015/05/07 01:09:56 jsg Exp $
+/*	$OpenBSD: trm.c,v 1.34 2020/01/23 07:53:00 krw Exp $
  * ------------------------------------------------------------
  *   O.S       : OpenBSD
  *   File Name : trm.c
@@ -134,10 +134,7 @@ struct  cfdriver trm_cd = {
 };
 
 struct scsi_adapter trm_switch = {
-	trm_scsi_cmd,
-	trm_minphys,
-	NULL,
-	NULL
+	trm_scsi_cmd, trm_minphys, NULL, NULL, NULL
 };
 
 /* 
diff --git a/sys/dev/ic/twe.c b/sys/dev/ic/twe.c
index c0cb880a190..65cfbfc6053 100644
--- a/sys/dev/ic/twe.c
+++ b/sys/dev/ic/twe.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: twe.c,v 1.47 2019/12/31 10:05:32 mpi Exp $	*/
+/*	$OpenBSD: twe.c,v 1.48 2020/01/23 07:53:00 krw Exp $	*/
 
 /*
  * Copyright (c) 2000-2002 Michael Shalayeff.  All rights reserved.
@@ -65,7 +65,7 @@ struct cfdriver twe_cd = {
 void	twe_scsi_cmd(struct scsi_xfer *);
 
 struct scsi_adapter twe_switch = {
-	twe_scsi_cmd, tweminphys, 0, 0,
+	twe_scsi_cmd, tweminphys, NULL, NULL, NULL
 };
 
 void *twe_get_ccb(void *);
diff --git a/sys/dev/ic/uha.c b/sys/dev/ic/uha.c
index b0f3b08f5ab..bf5198e6fdf 100644
--- a/sys/dev/ic/uha.c
+++ b/sys/dev/ic/uha.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uha.c,v 1.26 2017/09/08 05:36:52 deraadt Exp $	*/
+/*	$OpenBSD: uha.c,v 1.27 2020/01/23 07:53:00 krw Exp $	*/
 /*	$NetBSD: uha.c,v 1.3 1996/10/13 01:37:29 christos Exp $	*/
 
 #undef UHADEBUG
@@ -82,10 +82,7 @@ void uhaminphys(struct buf *, struct scsi_link *);
 void uha_scsi_cmd(struct scsi_xfer *);
 
 struct scsi_adapter uha_switch = {
-	uha_scsi_cmd,
-	uhaminphys,
-	0,
-	0,
+	uha_scsi_cmd, uhaminphys, NULL, NULL, NULL
 };
 
 struct cfdriver uha_cd = {
diff --git a/sys/dev/isa/wds.c b/sys/dev/isa/wds.c
index 5ea1f5e7899..87c6d411a88 100644
--- a/sys/dev/isa/wds.c
+++ b/sys/dev/isa/wds.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wds.c,v 1.44 2019/12/31 10:05:32 mpi Exp $	*/
+/*	$OpenBSD: wds.c,v 1.45 2020/01/23 07:53:00 krw Exp $	*/
 /*	$NetBSD: wds.c,v 1.13 1996/11/03 16:20:31 mycroft Exp $	*/
 
 #undef	WDSDIAG
@@ -169,10 +169,7 @@ void	wds_timeout(void *);
 int	wdsprint(void *, const char *);
 
 struct scsi_adapter wds_switch = {
-	wds_scsi_cmd,
-	wdsminphys,
-	0,
-	0,
+	wds_scsi_cmd, wdsminphys, NULL, NULL, NULL
 };
 
 int	wdsprobe(struct device *, void *, void *);
diff --git a/sys/dev/pci/ips.c b/sys/dev/pci/ips.c
index ae494d7333f..b06dd4ebb65 100644
--- a/sys/dev/pci/ips.c
+++ b/sys/dev/pci/ips.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ips.c,v 1.113 2016/08/14 04:08:03 dlg Exp $	*/
+/*	$OpenBSD: ips.c,v 1.114 2020/01/23 07:53:00 krw Exp $	*/
 
 /*
  * Copyright (c) 2006, 2007, 2009 Alexander Yurchenko <grange@openbsd.org>
@@ -498,19 +498,11 @@ struct cfdriver ips_cd = {
 };
 
 static struct scsi_adapter ips_scsi_adapter = {
-	ips_scsi_cmd,
-	scsi_minphys,
-	NULL,
-	NULL,
-	ips_scsi_ioctl
+	ips_scsi_cmd, scsi_minphys, NULL, NULL, ips_scsi_ioctl
 };
 
 static struct scsi_adapter ips_scsi_pt_adapter = {
-	ips_scsi_pt_cmd,
-	scsi_minphys,
-	NULL,
-	NULL,
-	NULL
+	ips_scsi_pt_cmd, scsi_minphys, NULL, NULL, NULL
 };
 
 static const struct pci_matchid ips_ids[] = {
diff --git a/sys/dev/pci/mfii.c b/sys/dev/pci/mfii.c
index 089f07d958a..eba6088f81b 100644
--- a/sys/dev/pci/mfii.c
+++ b/sys/dev/pci/mfii.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mfii.c,v 1.64 2019/12/31 10:05:32 mpi Exp $ */
+/* $OpenBSD: mfii.c,v 1.65 2020/01/23 07:53:00 krw Exp $ */
 
 /*
  * Copyright (c) 2012 David Gwynne <dlg@openbsd.org>
@@ -379,20 +379,14 @@ int		mfii_scsi_ioctl(struct scsi_link *, u_long, caddr_t, int);
 int		mfii_ioctl_cache(struct scsi_link *, u_long, struct dk_cache *);
 
 struct scsi_adapter mfii_switch = {
-	mfii_scsi_cmd,
-	scsi_minphys,
-	NULL, /* probe */
-	NULL, /* unprobe */
-	mfii_scsi_ioctl
+	mfii_scsi_cmd, scsi_minphys, NULL, NULL, mfii_scsi_ioctl
 };
 
 void		mfii_pd_scsi_cmd(struct scsi_xfer *);
 int		mfii_pd_scsi_probe(struct scsi_link *);
 
 struct scsi_adapter mfii_pd_switch = {
-	mfii_pd_scsi_cmd,
-	scsi_minphys,
-	mfii_pd_scsi_probe
+	mfii_pd_scsi_cmd, scsi_minphys, mfii_pd_scsi_probe, NULL, NULL,
 };
 
 #define DEVNAME(_sc)		((_sc)->sc_dev.dv_xname)
diff --git a/sys/dev/pci/mpii.c b/sys/dev/pci/mpii.c
index 192920103f2..5fc5aa1f10b 100644
--- a/sys/dev/pci/mpii.c
+++ b/sys/dev/pci/mpii.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mpii.c,v 1.126 2020/01/13 19:57:19 kn Exp $	*/
+/*	$OpenBSD: mpii.c,v 1.127 2020/01/23 07:53:00 krw Exp $	*/
 /*
  * Copyright (c) 2010, 2012 Mike Belopuhov
  * Copyright (c) 2009 James Giannoules
@@ -269,11 +269,7 @@ int		mpii_scsi_probe(struct scsi_link *);
 int		mpii_scsi_ioctl(struct scsi_link *, u_long, caddr_t, int);
 
 struct scsi_adapter mpii_switch = {
-	mpii_scsi_cmd,
-	scsi_minphys,
-	mpii_scsi_probe,
-	NULL,
-	mpii_scsi_ioctl
+	mpii_scsi_cmd, scsi_minphys, mpii_scsi_probe, NULL, mpii_scsi_ioctl
 };
 
 struct mpii_dmamem *
diff --git a/sys/dev/pci/qle.c b/sys/dev/pci/qle.c
index 513e2d198bf..8e2ca42add0 100644
--- a/sys/dev/pci/qle.c
+++ b/sys/dev/pci/qle.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: qle.c,v 1.49 2020/01/15 00:17:21 cheloha Exp $ */
+/*	$OpenBSD: qle.c,v 1.50 2020/01/23 07:53:00 krw Exp $ */
 
 /*
  * Copyright (c) 2013, 2014 Jonathan Matthew <jmatthew@openbsd.org>
@@ -255,11 +255,7 @@ int		qle_scsi_probe(struct scsi_link *);
 
 
 struct scsi_adapter qle_switch = {
-	qle_scsi_cmd,
-	scsi_minphys,
-	qle_scsi_probe,
-	NULL,	/* scsi_free */
-	NULL	/* ioctl */
+	qle_scsi_cmd, scsi_minphys, qle_scsi_probe, NULL, NULL
 };
 
 u_int32_t	qle_read(struct qle_softc *, int);
diff --git a/sys/dev/pci/vmwpvs.c b/sys/dev/pci/vmwpvs.c
index 5483f12c514..28a07d93756 100644
--- a/sys/dev/pci/vmwpvs.c
+++ b/sys/dev/pci/vmwpvs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vmwpvs.c,v 1.14 2016/08/26 00:45:50 jsg Exp $ */
+/*	$OpenBSD: vmwpvs.c,v 1.15 2020/01/23 07:53:00 krw Exp $ */
 
 /*
  * Copyright (c) 2013 David Gwynne <dlg@openbsd.org>
@@ -356,11 +356,7 @@ struct cfdriver vmwpvs_cd = {
 void		vmwpvs_scsi_cmd(struct scsi_xfer *);
 
 struct scsi_adapter vmwpvs_switch = {
-	vmwpvs_scsi_cmd,
-	scsi_minphys,
-	NULL,
-	NULL,
-	NULL
+	vmwpvs_scsi_cmd, scsi_minphys, NULL, NULL, NULL
 };
 
 #define dwordsof(s)		(sizeof(s) / sizeof(u_int32_t))
diff --git a/sys/dev/pv/vioscsi.c b/sys/dev/pv/vioscsi.c
index f42b7d1be0a..b3e743ce183 100644
--- a/sys/dev/pv/vioscsi.c
+++ b/sys/dev/pv/vioscsi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vioscsi.c,v 1.13 2019/05/26 15:20:04 sf Exp $	*/
+/*	$OpenBSD: vioscsi.c,v 1.14 2020/01/23 07:53:00 krw Exp $	*/
 /*
  * Copyright (c) 2013 Google Inc.
  *
@@ -86,8 +86,7 @@ struct cfdriver vioscsi_cd = {
 };
 
 struct scsi_adapter vioscsi_switch = {
-	vioscsi_scsi_cmd,
-	scsi_minphys,
+	vioscsi_scsi_cmd, scsi_minphys, NULL, NULL, NULL
 };
 
 const char *const vioscsi_vq_names[] = {
diff --git a/sys/dev/usb/umass_scsi.c b/sys/dev/usb/umass_scsi.c
index d2f76f077d9..7755981b13f 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.46 2018/05/01 18:14:46 landry Exp $ */
+/*	$OpenBSD: umass_scsi.c,v 1.47 2020/01/23 07:53:00 krw Exp $ */
 /*	$NetBSD: umass_scsipi.c,v 1.9 2003/02/16 23:14:08 augustss Exp $	*/
 /*
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -69,9 +69,7 @@ void umass_scsi_cmd(struct scsi_xfer *);
 void umass_scsi_minphys(struct buf *, struct scsi_link *);
 
 struct scsi_adapter umass_scsi_switch = {
-	umass_scsi_cmd,
-	umass_scsi_minphys,
-	umass_scsi_probe
+	umass_scsi_cmd, umass_scsi_minphys, umass_scsi_probe, NULL, NULL
 };
 
 void umass_scsi_cb(struct umass_softc *sc, void *priv, int residue,
diff --git a/sys/dev/vscsi.c b/sys/dev/vscsi.c
index c5213de556c..048b50c3eac 100644
--- a/sys/dev/vscsi.c
+++ b/sys/dev/vscsi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vscsi.c,v 1.45 2019/12/31 22:57:07 jsg Exp $ */
+/*	$OpenBSD: vscsi.c,v 1.46 2020/01/23 07:52:59 krw Exp $ */
 
 /*
  * Copyright (c) 2008 David Gwynne <dlg@openbsd.org>
@@ -96,10 +96,7 @@ int		vscsi_probe(struct scsi_link *);
 void		vscsi_free(struct scsi_link *);
 
 struct scsi_adapter vscsi_switch = {
-	vscsi_cmd,
-	scsi_minphys,
-	vscsi_probe,
-	vscsi_free
+	vscsi_cmd, scsi_minphys, vscsi_probe, vscsi_free, NULL
 };
 
 int		vscsi_i2t(struct vscsi_softc *, struct vscsi_ioc_i2t *);
diff --git a/sys/scsi/mpath.c b/sys/scsi/mpath.c
index b789c74c785..f7518bba80e 100644
--- a/sys/scsi/mpath.c
+++ b/sys/scsi/mpath.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mpath.c,v 1.43 2019/09/27 17:22:31 krw Exp $ */
+/*	$OpenBSD: mpath.c,v 1.44 2020/01/23 07:53:00 krw Exp $ */
 
 /*
  * Copyright (c) 2009 David Gwynne <dlg@openbsd.org>
@@ -98,9 +98,7 @@ void		mpath_failover_start(void *);
 void		mpath_failover_check(struct mpath_dev *);
 
 struct scsi_adapter mpath_switch = {
-	mpath_cmd,
-	scsi_minphys,
-	mpath_probe
+	mpath_cmd, scsi_minphys, mpath_probe, NULL, NULL
 };
 
 void		mpath_xs_stuffup(struct scsi_xfer *);