Nuke unnecessary abstraction 'scsi_minphys()' which just calls

'minphys()'. Just use & check for NULL instead, since 'minphys()' is
always called on the code path ([cd|sd|st]minphys) that calls
physio().

8 files changed, 15 insertions, 18 deletions

diff --git a/sys/dev/ic/aac.c b/sys/dev/ic/aac.c
index 6ec520de0a2..08b4d94cfca 100644
--- a/sys/dev/ic/aac.c
+++ b/sys/dev/ic/aac.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: aac.c,v 1.73 2020/01/23 07:52:59 krw Exp $	*/
+/*	$OpenBSD: aac.c,v 1.74 2020/02/05 16:29:29 krw Exp $	*/
 
 /*-
  * Copyright (c) 2000 Michael Smith
@@ -130,7 +130,7 @@ struct cfdriver aac_cd = {
 };
 
 struct scsi_adapter aac_switch = {
-	aac_scsi_cmd, scsi_minphys, NULL, NULL, NULL
+	aac_scsi_cmd, NULL, NULL, NULL, NULL
 };
 
 /* Falcon/PPC interface */
diff --git a/sys/dev/ic/aic6250.c b/sys/dev/ic/aic6250.c
index 144cc371d36..5853b47714c 100644
--- a/sys/dev/ic/aic6250.c
+++ b/sys/dev/ic/aic6250.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: aic6250.c,v 1.6 2020/01/23 07:52:59 krw Exp $	*/
+/*	$OpenBSD: aic6250.c,v 1.7 2020/02/05 16:29:29 krw Exp $	*/
 
 /*
  * Copyright (c) 2010, 2013 Miodrag Vallat.
@@ -167,7 +167,7 @@ struct cfdriver oaic_cd = {
 };
 
 struct scsi_adapter aic6250_switch = {
-	aic6250_scsi_cmd, scsi_minphys, NULL, NULL, NULL
+	aic6250_scsi_cmd, NULL, NULL, NULL, NULL
 };
 
 /*
diff --git a/sys/dev/ic/aic6360.c b/sys/dev/ic/aic6360.c
index d818d5775c3..b04ba119cc4 100644
--- a/sys/dev/ic/aic6360.c
+++ b/sys/dev/ic/aic6360.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: aic6360.c,v 1.30 2020/01/23 07:52:59 krw Exp $	*/
+/*	$OpenBSD: aic6360.c,v 1.31 2020/02/05 16:29:29 krw Exp $	*/
 /*	$NetBSD: aic6360.c,v 1.52 1996/12/10 21:27:51 thorpej Exp $	*/
 
 #ifdef DDB
@@ -185,7 +185,7 @@ struct cfdriver aic_cd = {
 };
 
 struct scsi_adapter aic_switch = {
-	aic_scsi_cmd, scsi_minphys, NULL, NULL, NULL
+	aic_scsi_cmd, NULL, NULL, NULL, NULL
 };
 
 /*
diff --git a/sys/dev/ic/ncr53c9x.c b/sys/dev/ic/ncr53c9x.c
index 924b669148f..8bbaf42cf52 100644
--- a/sys/dev/ic/ncr53c9x.c
+++ b/sys/dev/ic/ncr53c9x.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ncr53c9x.c,v 1.66 2020/01/23 07:53:00 krw Exp $	*/
+/*	$OpenBSD: ncr53c9x.c,v 1.67 2020/02/05 16:29:29 krw Exp $	*/
 /*     $NetBSD: ncr53c9x.c,v 1.56 2000/11/30 14:41:46 thorpej Exp $    */
 
 /*
@@ -150,7 +150,7 @@ int	ncr53c9x_scsi_probe(struct scsi_link *);
 void	ncr53c9x_scsi_free(struct scsi_link *);
 
 struct scsi_adapter ncr53c9x_adapter = {
-	ncr53c9x_scsi_cmd, scsi_minphys, ncr53c9x_scsi_probe,
+	ncr53c9x_scsi_cmd, NULL, ncr53c9x_scsi_probe,
 	ncr53c9x_scsi_free, NULL
 };
 
diff --git a/sys/dev/ic/nvme.c b/sys/dev/ic/nvme.c
index 4fbe81185f8..a44c3e5df8f 100644
--- a/sys/dev/ic/nvme.c
+++ b/sys/dev/ic/nvme.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nvme.c,v 1.64 2020/01/23 07:53:00 krw Exp $ */
+/*	$OpenBSD: nvme.c,v 1.65 2020/02/05 16:29:29 krw Exp $ */
 
 /*
  * Copyright (c) 2014 David Gwynne <dlg@openbsd.org>
@@ -98,7 +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, scsi_minphys, nvme_scsi_probe, nvme_scsi_free, NULL
+	nvme_scsi_cmd, NULL, nvme_scsi_probe, nvme_scsi_free, NULL
 };
 
 void	nvme_scsi_io(struct scsi_xfer *, int);
diff --git a/sys/dev/ic/osiop.c b/sys/dev/ic/osiop.c
index 5d6ea62d86f..9622de0debd 100644
--- a/sys/dev/ic/osiop.c
+++ b/sys/dev/ic/osiop.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: osiop.c,v 1.53 2020/01/25 21:48:42 krw Exp $	*/
+/*	$OpenBSD: osiop.c,v 1.54 2020/02/05 16:29:29 krw Exp $	*/
 /*	$NetBSD: osiop.c,v 1.9 2002/04/05 18:27:54 bouyer Exp $	*/
 
 /*
@@ -344,9 +344,6 @@ osiop_attach(sc)
 	config_found(&sc->sc_dev, &saa, scsiprint);
 }
 
-/*
- * default minphys routine for osiop based controllers
- */
 void
 osiop_minphys(struct buf *bp, struct scsi_link *sl)
 {
diff --git a/sys/dev/ic/qla.c b/sys/dev/ic/qla.c
index 82cd75729bf..b11e6c1cace 100644
--- a/sys/dev/ic/qla.c
+++ b/sys/dev/ic/qla.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: qla.c,v 1.59 2020/01/23 07:53:00 krw Exp $ */
+/*	$OpenBSD: qla.c,v 1.60 2020/02/05 16:29:29 krw Exp $ */
 
 /*
  * Copyright (c) 2011 David Gwynne <dlg@openbsd.org>
@@ -170,7 +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, NULL
+	qla_scsi_cmd, NULL, qla_scsi_probe, NULL, NULL
 };
 
 int
diff --git a/sys/dev/ic/qlw.c b/sys/dev/ic/qlw.c
index 42ebc3b587e..8c1304f5acd 100644
--- a/sys/dev/ic/qlw.c
+++ b/sys/dev/ic/qlw.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: qlw.c,v 1.33 2020/01/23 07:53:00 krw Exp $ */
+/*	$OpenBSD: qlw.c,v 1.34 2020/02/05 16:29:30 krw Exp $ */
 
 /*
  * Copyright (c) 2011 David Gwynne <dlg@openbsd.org>
@@ -164,7 +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, NULL
+	qlw_scsi_cmd, NULL, qlw_scsi_probe, NULL, NULL
 };
 
 int