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().

5 files changed, 12 insertions, 12 deletions

diff --git a/sys/dev/pci/ips.c b/sys/dev/pci/ips.c
index b06dd4ebb65..f3f48d08512 100644
--- a/sys/dev/pci/ips.c
+++ b/sys/dev/pci/ips.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ips.c,v 1.114 2020/01/23 07:53:00 krw Exp $	*/
+/*	$OpenBSD: ips.c,v 1.115 2020/02/05 16:29:30 krw Exp $	*/
 
 /*
  * Copyright (c) 2006, 2007, 2009 Alexander Yurchenko <grange@openbsd.org>
@@ -498,11 +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, NULL, 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, NULL, 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 9aada52b7ce..95b98ce35dd 100644
--- a/sys/dev/pci/mfii.c
+++ b/sys/dev/pci/mfii.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mfii.c,v 1.66 2020/01/25 05:38:02 jmatthew Exp $ */
+/* $OpenBSD: mfii.c,v 1.67 2020/02/05 16:29:30 krw Exp $ */
 
 /*
  * Copyright (c) 2012 David Gwynne <dlg@openbsd.org>
@@ -385,14 +385,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, NULL, mfii_scsi_ioctl
+	mfii_scsi_cmd, NULL, 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, NULL, NULL,
+	mfii_pd_scsi_cmd, NULL, 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 5fc5aa1f10b..f5c5cf6303f 100644
--- a/sys/dev/pci/mpii.c
+++ b/sys/dev/pci/mpii.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mpii.c,v 1.127 2020/01/23 07:53:00 krw Exp $	*/
+/*	$OpenBSD: mpii.c,v 1.128 2020/02/05 16:29:30 krw Exp $	*/
 /*
  * Copyright (c) 2010, 2012 Mike Belopuhov
  * Copyright (c) 2009 James Giannoules
@@ -269,7 +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, NULL, 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 8e2ca42add0..5787f45c423 100644
--- a/sys/dev/pci/qle.c
+++ b/sys/dev/pci/qle.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: qle.c,v 1.50 2020/01/23 07:53:00 krw Exp $ */
+/*	$OpenBSD: qle.c,v 1.51 2020/02/05 16:29:30 krw Exp $ */
 
 /*
  * Copyright (c) 2013, 2014 Jonathan Matthew <jmatthew@openbsd.org>
@@ -255,7 +255,7 @@ int		qle_scsi_probe(struct scsi_link *);
 
 
 struct scsi_adapter qle_switch = {
-	qle_scsi_cmd, scsi_minphys, qle_scsi_probe, NULL, NULL
+	qle_scsi_cmd, NULL, 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 28a07d93756..d607282dd65 100644
--- a/sys/dev/pci/vmwpvs.c
+++ b/sys/dev/pci/vmwpvs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vmwpvs.c,v 1.15 2020/01/23 07:53:00 krw Exp $ */
+/*	$OpenBSD: vmwpvs.c,v 1.16 2020/02/05 16:29:30 krw Exp $ */
 
 /*
  * Copyright (c) 2013 David Gwynne <dlg@openbsd.org>
@@ -356,7 +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, NULL, NULL, NULL, NULL
 };
 
 #define dwordsof(s)		(sizeof(s) / sizeof(u_int32_t))