Drivers that implement their own *minphys() don't need to call the

system minphys(). scsi_minphys() will do that and cd/sd/st will call
scsi_minphys().

ok jmatthew@ as part of larger diff

23 files changed, 23 insertions, 51 deletions

diff --git a/sys/dev/atapiscsi/atapiscsi.c b/sys/dev/atapiscsi/atapiscsi.c
index e33178b85eb..4fb5a83c24c 100644
--- a/sys/dev/atapiscsi/atapiscsi.c
+++ b/sys/dev/atapiscsi/atapiscsi.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: atapiscsi.c,v 1.107 2020/01/23 07:52:59 krw Exp $     */
+/*      $OpenBSD: atapiscsi.c,v 1.108 2020/01/25 21:48:42 krw Exp $     */
 
 /*
  * This code is derived from code with the copyright below.
@@ -425,7 +425,6 @@ wdc_atapi_minphys (struct buf *bp, struct scsi_link *sl)
 {
 	if (bp->b_bcount > MAX_SIZE)
 		bp->b_bcount = MAX_SIZE;
-	minphys(bp);
 }
 
 int
diff --git a/sys/dev/ic/adv.c b/sys/dev/ic/adv.c
index 158861ebaad..7609f164989 100644
--- a/sys/dev/ic/adv.c
+++ b/sys/dev/ic/adv.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: adv.c,v 1.38 2020/01/23 07:52:59 krw Exp $	*/
+/*	$OpenBSD: adv.c,v 1.39 2020/01/25 21:48:42 krw Exp $	*/
 /*	$NetBSD: adv.c,v 1.6 1998/10/28 20:39:45 dante Exp $	*/
 
 /*
@@ -521,7 +521,6 @@ advminphys(struct buf *bp, struct scsi_link *sl)
 {
 	if (bp->b_bcount > ((ASC_MAX_SG_LIST - 1) * PAGE_SIZE))
 		bp->b_bcount = ((ASC_MAX_SG_LIST - 1) * PAGE_SIZE);
-	minphys(bp);
 }
 
 
diff --git a/sys/dev/ic/adw.c b/sys/dev/ic/adw.c
index 8ffd2b3d0d4..0761a79c8b3 100644
--- a/sys/dev/ic/adw.c
+++ b/sys/dev/ic/adw.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: adw.c,v 1.55 2017/09/08 05:36:52 deraadt Exp $ */
+/*	$OpenBSD: adw.c,v 1.56 2020/01/25 21:48:42 krw Exp $ */
 /* $NetBSD: adw.c,v 1.23 2000/05/27 18:24:50 dante Exp $	 */
 
 /*
@@ -528,7 +528,6 @@ adw_minphys(struct buf *bp, struct scsi_link *sl)
 
 	if (bp->b_bcount > ((ADW_MAX_SG_LIST - 1) * PAGE_SIZE))
 		bp->b_bcount = ((ADW_MAX_SG_LIST - 1) * PAGE_SIZE);
-	minphys(bp);
 }
 
 
diff --git a/sys/dev/ic/aic79xx_openbsd.c b/sys/dev/ic/aic79xx_openbsd.c
index b14409805be..c04dcb806ef 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.47 2020/01/23 07:53:00 krw Exp $	*/
+/*	$OpenBSD: aic79xx_openbsd.c,v 1.48 2020/01/25 21:48:42 krw Exp $	*/
 
 /*
  * Copyright (c) 2004 Milos Urbanek, Kenneth R. Westerback & Marco Peereboom
@@ -262,7 +262,6 @@ ahd_minphys(struct buf *bp, struct scsi_link *sl)
 	if (bp->b_bcount > ((AHD_NSEG - 1) * PAGE_SIZE)) {
 		bp->b_bcount = ((AHD_NSEG - 1) * PAGE_SIZE);
 	}
-	minphys(bp);
 }
 
 void
diff --git a/sys/dev/ic/aic7xxx_openbsd.c b/sys/dev/ic/aic7xxx_openbsd.c
index 83721c43133..3b584259da8 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.57 2020/01/23 07:53:00 krw Exp $	*/
+/*	$OpenBSD: aic7xxx_openbsd.c,v 1.58 2020/01/25 21:48:42 krw Exp $	*/
 /*	$NetBSD: aic7xxx_osm.c,v 1.14 2003/11/02 11:07:44 wiz Exp $	*/
 
 /*
@@ -267,7 +267,6 @@ ahc_minphys(struct buf *bp, struct scsi_link *sl)
 	if (bp->b_bcount > ((AHC_NSEG - 1) * PAGE_SIZE)) {
 		bp->b_bcount = ((AHC_NSEG - 1) * PAGE_SIZE);
 	}
-	minphys(bp);
 }
 
 void
diff --git a/sys/dev/ic/ami.c b/sys/dev/ic/ami.c
index d9f8e8f128e..ba41480e8d2 100644
--- a/sys/dev/ic/ami.c
+++ b/sys/dev/ic/ami.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ami.c,v 1.238 2020/01/23 07:53:00 krw Exp $	*/
+/*	$OpenBSD: ami.c,v 1.239 2020/01/25 21:48:42 krw Exp $	*/
 
 /*
  * Copyright (c) 2001 Michael Shalayeff
@@ -1195,7 +1195,6 @@ amiminphys(struct buf *bp, struct scsi_link *sl)
 {
 	if (bp->b_bcount > AMI_MAXFER)
 		bp->b_bcount = AMI_MAXFER;
-	minphys(bp);
 }
 
 void
diff --git a/sys/dev/ic/cac.c b/sys/dev/ic/cac.c
index 53b3151f33c..d26f2e0b859 100644
--- a/sys/dev/ic/cac.c
+++ b/sys/dev/ic/cac.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cac.c,v 1.56 2020/01/23 07:53:00 krw Exp $	*/
+/*	$OpenBSD: cac.c,v 1.57 2020/01/25 21:48:42 krw Exp $	*/
 /*	$NetBSD: cac.c,v 1.15 2000/11/08 19:20:35 ad Exp $	*/
 
 /*
@@ -566,7 +566,6 @@ cacminphys(struct buf *bp, struct scsi_link *sl)
 {
 	if (bp->b_bcount > CAC_MAX_XFER)
 		bp->b_bcount = CAC_MAX_XFER;
-	minphys(bp);
 }
 
 void
diff --git a/sys/dev/ic/ciss.c b/sys/dev/ic/ciss.c
index 3673a1d20be..efb92008134 100644
--- a/sys/dev/ic/ciss.c
+++ b/sys/dev/ic/ciss.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ciss.c,v 1.78 2020/01/23 01:43:17 cheloha Exp $	*/
+/*	$OpenBSD: ciss.c,v 1.79 2020/01/25 21:48:42 krw Exp $	*/
 
 /*
  * Copyright (c) 2005,2006 Michael Shalayeff
@@ -430,7 +430,6 @@ cissminphys(struct buf *bp, struct scsi_link *sl)
 	if (bp->b_bcount > CISS_MAXFER)
 		bp->b_bcount = CISS_MAXFER;
 #endif
-	minphys(bp);
 }
 
 /*
diff --git a/sys/dev/ic/gdt_common.c b/sys/dev/ic/gdt_common.c
index b10bc1e7a51..311352574d7 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.65 2020/01/23 07:53:00 krw Exp $	*/
+/*	$OpenBSD: gdt_common.c,v 1.66 2020/01/25 21:48:42 krw Exp $	*/
 
 /*
  * Copyright (c) 1999, 2000, 2003 Niklas Hallqvist.  All rights reserved.
@@ -1102,8 +1102,6 @@ gdtminphys(struct buf *bp, struct scsi_link *sl)
 	if ((GDT_MAXOFFSETS - 1) * PAGE_SIZE < MAXPHYS &&
 	    bp->b_bcount > ((GDT_MAXOFFSETS - 1) * PAGE_SIZE))
 		bp->b_bcount = ((GDT_MAXOFFSETS - 1) * PAGE_SIZE);
-
-	minphys(bp);
 }
 
 int
diff --git a/sys/dev/ic/iha.c b/sys/dev/ic/iha.c
index 1faa5872c57..1678f01a4af 100644
--- a/sys/dev/ic/iha.c
+++ b/sys/dev/ic/iha.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: iha.c,v 1.44 2020/01/23 07:53:00 krw Exp $ */
+/*	$OpenBSD: iha.c,v 1.45 2020/01/25 21:48:42 krw Exp $ */
 /*-------------------------------------------------------------------------
  *
  * Device driver for the INI-9XXXU/UW or INIC-940/950  PCI SCSI Controller.
@@ -453,8 +453,6 @@ iha_minphys(struct buf *bp, struct scsi_link *sl)
 {
 	if (bp->b_bcount > ((IHA_MAX_SG_ENTRIES - 1) * PAGE_SIZE))
 		bp->b_bcount = ((IHA_MAX_SG_ENTRIES - 1) * PAGE_SIZE);
-
-	minphys(bp);
 }
 
 /*
diff --git a/sys/dev/ic/mfi.c b/sys/dev/ic/mfi.c
index d7e4d7de544..35d1ed3e35c 100644
--- a/sys/dev/ic/mfi.c
+++ b/sys/dev/ic/mfi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mfi.c,v 1.172 2020/01/23 07:53:00 krw Exp $ */
+/* $OpenBSD: mfi.c,v 1.173 2020/01/25 21:48:42 krw Exp $ */
 /*
  * Copyright (c) 2006 Marco Peereboom <marco@peereboom.us>
  *
@@ -667,7 +667,6 @@ mfiminphys(struct buf *bp, struct scsi_link *sl)
 	/* XXX currently using MFI_MAXFER = MAXPHYS */
 	if (bp->b_bcount > MFI_MAXFER)
 		bp->b_bcount = MFI_MAXFER;
-	minphys(bp);
 }
 
 int
diff --git a/sys/dev/ic/mpi.c b/sys/dev/ic/mpi.c
index 621ab62a421..1b461169538 100644
--- a/sys/dev/ic/mpi.c
+++ b/sys/dev/ic/mpi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mpi.c,v 1.209 2020/01/23 07:53:00 krw Exp $ */
+/*	$OpenBSD: mpi.c,v 1.210 2020/01/25 21:48:42 krw Exp $ */
 
 /*
  * Copyright (c) 2005, 2006, 2009 David Gwynne <dlg@openbsd.org>
@@ -1606,7 +1606,6 @@ mpi_minphys(struct buf *bp, struct scsi_link *sl)
 	/* XXX */
 	if (bp->b_bcount > MAXPHYS)
 		bp->b_bcount = MAXPHYS;
-	minphys(bp);
 }
 
 int
diff --git a/sys/dev/ic/oosiop.c b/sys/dev/ic/oosiop.c
index fe2647a2532..38f67dc46dd 100644
--- a/sys/dev/ic/oosiop.c
+++ b/sys/dev/ic/oosiop.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: oosiop.c,v 1.23 2020/01/23 07:53:00 krw Exp $	*/
+/*	$OpenBSD: oosiop.c,v 1.24 2020/01/25 21:48:42 krw Exp $	*/
 /*	$NetBSD: oosiop.c,v 1.4 2003/10/29 17:45:55 tsutsui Exp $	*/
 
 /*
@@ -728,7 +728,6 @@ oosiop_minphys(struct buf *bp, struct scsi_link *sl)
 
 	if (bp->b_bcount > OOSIOP_MAX_XFER)
 		bp->b_bcount = OOSIOP_MAX_XFER;
-	minphys(bp);
 }
 
 void
diff --git a/sys/dev/ic/osiop.c b/sys/dev/ic/osiop.c
index cac4844df05..5d6ea62d86f 100644
--- a/sys/dev/ic/osiop.c
+++ b/sys/dev/ic/osiop.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: osiop.c,v 1.52 2020/01/23 07:53:00 krw Exp $	*/
+/*	$OpenBSD: osiop.c,v 1.53 2020/01/25 21:48:42 krw Exp $	*/
 /*	$NetBSD: osiop.c,v 1.9 2002/04/05 18:27:54 bouyer Exp $	*/
 
 /*
@@ -352,7 +352,6 @@ osiop_minphys(struct buf *bp, struct scsi_link *sl)
 {
 	if (bp->b_bcount > OSIOP_MAX_XFER)
 		bp->b_bcount = OSIOP_MAX_XFER;
-	minphys(bp);
 }
 
 void *
diff --git a/sys/dev/ic/siop_common.c b/sys/dev/ic/siop_common.c
index 2b0e56fef5c..18a4897eeb0 100644
--- a/sys/dev/ic/siop_common.c
+++ b/sys/dev/ic/siop_common.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: siop_common.c,v 1.36 2014/12/19 22:44:58 guenther Exp $ */
+/*	$OpenBSD: siop_common.c,v 1.37 2020/01/25 21:48:42 krw Exp $ */
 /*	$NetBSD: siop_common.c,v 1.37 2005/02/27 00:27:02 perry Exp $	*/
 
 /*
@@ -706,8 +706,6 @@ siop_minphys(struct buf *bp, struct scsi_link *sl)
 {
 	if (bp->b_bcount > SIOP_MAXFER)
 		bp->b_bcount = SIOP_MAXFER;
-
-	minphys(bp);
 }
 
 void
diff --git a/sys/dev/ic/trm.c b/sys/dev/ic/trm.c
index 09839b02d73..7f7c558d664 100644
--- a/sys/dev/ic/trm.c
+++ b/sys/dev/ic/trm.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: trm.c,v 1.34 2020/01/23 07:53:00 krw Exp $
+/*	$OpenBSD: trm.c,v 1.35 2020/01/25 21:48:42 krw Exp $
  * ------------------------------------------------------------
  *   O.S       : OpenBSD
  *   File Name : trm.c
@@ -2363,7 +2363,6 @@ trm_minphys(struct buf *bp, struct scsi_link *sl)
 	if (bp->b_bcount > (TRM_MAX_SG_LISTENTRY-1) * (long) NBPG) {
 		bp->b_bcount = (TRM_MAX_SG_LISTENTRY-1) * (long) NBPG;
 	}
-	minphys(bp);
 }
 
 /*
diff --git a/sys/dev/ic/twe.c b/sys/dev/ic/twe.c
index 65cfbfc6053..27fa7f09395 100644
--- a/sys/dev/ic/twe.c
+++ b/sys/dev/ic/twe.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: twe.c,v 1.48 2020/01/23 07:53:00 krw Exp $	*/
+/*	$OpenBSD: twe.c,v 1.49 2020/01/25 21:48:42 krw Exp $	*/
 
 /*
  * Copyright (c) 2000-2002 Michael Shalayeff.  All rights reserved.
@@ -757,7 +757,6 @@ tweminphys(struct buf *bp, struct scsi_link *sl)
 {
 	if (bp->b_bcount > TWE_MAXFER)
 		bp->b_bcount = TWE_MAXFER;
-	minphys(bp);
 }
 
 void
diff --git a/sys/dev/ic/uha.c b/sys/dev/ic/uha.c
index bf5198e6fdf..2313c64f5ff 100644
--- a/sys/dev/ic/uha.c
+++ b/sys/dev/ic/uha.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uha.c,v 1.27 2020/01/23 07:53:00 krw Exp $	*/
+/*	$OpenBSD: uha.c,v 1.28 2020/01/25 21:48:42 krw Exp $	*/
 /*	$NetBSD: uha.c,v 1.3 1996/10/13 01:37:29 christos Exp $	*/
 
 #undef UHADEBUG
@@ -265,7 +265,6 @@ uhaminphys(struct buf *bp, struct scsi_link *sl)
 {
 	if (bp->b_bcount > ((UHA_NSEG - 1) << PGSHIFT))
 		bp->b_bcount = ((UHA_NSEG - 1) << PGSHIFT);
-	minphys(bp);
 }
 
 /*
diff --git a/sys/dev/isa/wds.c b/sys/dev/isa/wds.c
index 87c6d411a88..30269681b9d 100644
--- a/sys/dev/isa/wds.c
+++ b/sys/dev/isa/wds.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wds.c,v 1.45 2020/01/23 07:53:00 krw Exp $	*/
+/*	$OpenBSD: wds.c,v 1.46 2020/01/25 21:48:42 krw Exp $	*/
 /*	$NetBSD: wds.c,v 1.13 1996/11/03 16:20:31 mycroft Exp $	*/
 
 #undef	WDSDIAG
@@ -874,7 +874,6 @@ wdsminphys(struct buf *bp, struct scsi_link *sl)
 {
 	if (bp->b_bcount > ((WDS_NSEG - 1) << PGSHIFT))
 		bp->b_bcount = ((WDS_NSEG - 1) << PGSHIFT);
-	minphys(bp);
 }
 
 /*
diff --git a/sys/dev/pci/arc.c b/sys/dev/pci/arc.c
index f5ad53b7a38..eaa01bb2b08 100644
--- a/sys/dev/pci/arc.c
+++ b/sys/dev/pci/arc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: arc.c,v 1.108 2020/01/09 14:35:19 mpi Exp $ */
+/*	$OpenBSD: arc.c,v 1.109 2020/01/25 21:48:42 krw Exp $ */
 
 /*
  * Copyright (c) 2006 David Gwynne <dlg@openbsd.org>
@@ -1408,7 +1408,6 @@ arc_minphys(struct buf *bp, struct scsi_link *sl)
 {
 	if (bp->b_bcount > MAXPHYS)
 		bp->b_bcount = MAXPHYS;
-	minphys(bp);
 }
 
 void
diff --git a/sys/dev/sdmmc/sdmmc_scsi.c b/sys/dev/sdmmc/sdmmc_scsi.c
index 870d0d15da2..b6c175f013f 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.42 2018/03/30 07:18:39 jmatthew Exp $	*/
+/*	$OpenBSD: sdmmc_scsi.c,v 1.43 2020/01/25 21:48:43 krw Exp $	*/
 
 /*
  * Copyright (c) 2006 Uwe Stuehler <uwe@openbsd.org>
@@ -556,8 +556,6 @@ sdmmc_scsi_minphys(struct buf *bp, struct scsi_link *sl)
 	if (sc->sc_max_xfer != 0 &&
 	    bp->b_bcount > sf->csd.sector_size * sc->sc_max_xfer)
 		bp->b_bcount = sf->csd.sector_size * sc->sc_max_xfer;
-
-	minphys(bp);
 }
 
 #ifdef HIBERNATE
diff --git a/sys/dev/softraid.c b/sys/dev/softraid.c
index 5c01bec398d..746e740eabd 100644
--- a/sys/dev/softraid.c
+++ b/sys/dev/softraid.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: softraid.c,v 1.396 2019/08/08 02:19:55 cheloha Exp $ */
+/* $OpenBSD: softraid.c,v 1.397 2020/01/25 21:48:42 krw Exp $ */
 /*
  * Copyright (c) 2007, 2008, 2009 Marco Peereboom <marco@peereboom.us>
  * Copyright (c) 2008 Chris Kuethe <ckuethe@openbsd.org>
@@ -1894,7 +1894,6 @@ sr_minphys(struct buf *bp, struct scsi_link *sl)
 	/* XXX currently using SR_MAXFER = MAXPHYS */
 	if (bp->b_bcount > SR_MAXFER)
 		bp->b_bcount = SR_MAXFER;
-	minphys(bp);
 }
 
 void
diff --git a/sys/dev/usb/umass_scsi.c b/sys/dev/usb/umass_scsi.c
index 7755981b13f..6226da74ad9 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.47 2020/01/23 07:53:00 krw Exp $ */
+/*	$OpenBSD: umass_scsi.c,v 1.48 2020/01/25 21:48:43 krw Exp $ */
 /*	$NetBSD: umass_scsipi.c,v 1.9 2003/02/16 23:14:08 augustss Exp $	*/
 /*
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -268,8 +268,6 @@ umass_scsi_minphys(struct buf *bp, struct scsi_link *sl)
 {
 	if (bp->b_bcount > UMASS_MAX_TRANSFER_SIZE)
 		bp->b_bcount = UMASS_MAX_TRANSFER_SIZE;
-
-	minphys(bp);
 }
 
 void