Shuffle some names around to make reading the code less headache

inducing. Rename scsi_adapter member 'scsi_minphys' to 'dev_minphys'
to reflect what it is supposed to do. Use consistent naming convention
(<dev>_minphys) for the actual device functions.

No functional change.

13 files changed, 43 insertions, 43 deletions

diff --git a/sys/dev/ic/adv.c b/sys/dev/ic/adv.c
index 7609f164989..d9b036cffc4 100644
--- a/sys/dev/ic/adv.c
+++ b/sys/dev/ic/adv.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: adv.c,v 1.39 2020/01/25 21:48:42 krw Exp $	*/
+/*	$OpenBSD: adv.c,v 1.40 2020/01/26 00:53:31 krw Exp $	*/
 /*	$NetBSD: adv.c,v 1.6 1998/10/28 20:39:45 dante Exp $	*/
 
 /*
@@ -66,7 +66,7 @@ static void adv_start_ccbs(ASC_SOFTC *);
 static u_int8_t *adv_alloc_overrunbuf(char *dvname, bus_dma_tag_t);
 
 static void adv_scsi_cmd(struct scsi_xfer *);
-static void advminphys(struct buf *, struct scsi_link *);
+static void adv_minphys(struct buf *, struct scsi_link *);
 static void adv_narrow_isr_callback(ASC_SOFTC *, ASC_QDONE_INFO *);
 
 static int adv_poll(ASC_SOFTC *, struct scsi_xfer *, int);
@@ -83,7 +83,7 @@ struct cfdriver adv_cd = {
 
 
 struct scsi_adapter adv_switch = {
-	adv_scsi_cmd, advminphys, NULL, NULL, NULL
+	adv_scsi_cmd, adv_minphys, NULL, NULL, NULL
 };
 
 
diff --git a/sys/dev/ic/adw.c b/sys/dev/ic/adw.c
index 0761a79c8b3..f441bef19f1 100644
--- a/sys/dev/ic/adw.c
+++ b/sys/dev/ic/adw.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: adw.c,v 1.56 2020/01/25 21:48:42 krw Exp $ */
+/*	$OpenBSD: adw.c,v 1.57 2020/01/26 00:53:31 krw Exp $ */
 /* $NetBSD: adw.c,v 1.23 2000/05/27 18:24:50 dante Exp $	 */
 
 /*
@@ -503,7 +503,7 @@ adw_attach(ADW_SOFTC *sc)
 	 * Fill in the adapter.
 	 */
 	sc->sc_adapter.scsi_cmd = adw_scsi_cmd;
-	sc->sc_adapter.scsi_minphys = adw_minphys;
+	sc->sc_adapter.dev_minphys = adw_minphys;
 
 	/*
          * fill in the prototype scsi_link.
diff --git a/sys/dev/ic/ami.c b/sys/dev/ic/ami.c
index ba41480e8d2..b9425ffc6d0 100644
--- a/sys/dev/ic/ami.c
+++ b/sys/dev/ic/ami.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ami.c,v 1.239 2020/01/25 21:48:42 krw Exp $	*/
+/*	$OpenBSD: ami.c,v 1.240 2020/01/26 00:53:31 krw Exp $	*/
 
 /*
  * Copyright (c) 2001 Michael Shalayeff
@@ -95,16 +95,16 @@ struct cfdriver ami_cd = {
 
 void	ami_scsi_cmd(struct scsi_xfer *);
 int	ami_scsi_ioctl(struct scsi_link *, u_long, caddr_t, int);
-void	amiminphys(struct buf *bp, struct scsi_link *sl);
+void	ami_minphys(struct buf *bp, struct scsi_link *sl);
 
 struct scsi_adapter ami_switch = {
-	ami_scsi_cmd, amiminphys, NULL, NULL, ami_scsi_ioctl
+	ami_scsi_cmd, ami_minphys, NULL, NULL, ami_scsi_ioctl
 };
 
 void	ami_scsi_raw_cmd(struct scsi_xfer *);
 
 struct scsi_adapter ami_raw_switch = {
-	ami_scsi_raw_cmd, amiminphys, NULL, NULL, NULL
+	ami_scsi_raw_cmd, ami_minphys, NULL, NULL, NULL
 };
 
 void *		ami_get_ccb(void *);
@@ -1191,7 +1191,7 @@ ami_done_init(struct ami_softc *sc, struct ami_ccb *ccb)
 }
 
 void
-amiminphys(struct buf *bp, struct scsi_link *sl)
+ami_minphys(struct buf *bp, struct scsi_link *sl)
 {
 	if (bp->b_bcount > AMI_MAXFER)
 		bp->b_bcount = AMI_MAXFER;
diff --git a/sys/dev/ic/cac.c b/sys/dev/ic/cac.c
index d26f2e0b859..690f1e86c6e 100644
--- a/sys/dev/ic/cac.c
+++ b/sys/dev/ic/cac.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cac.c,v 1.57 2020/01/25 21:48:42 krw Exp $	*/
+/*	$OpenBSD: cac.c,v 1.58 2020/01/26 00:53:31 krw Exp $	*/
 /*	$NetBSD: cac.c,v 1.15 2000/11/08 19:20:35 ad Exp $	*/
 
 /*
@@ -96,10 +96,10 @@ struct cfdriver cac_cd = {
 };
 
 void    cac_scsi_cmd(struct scsi_xfer *);
-void	cacminphys(struct buf *bp, struct scsi_link *sl);
+void	cac_minphys(struct buf *bp, struct scsi_link *sl);
 
 struct scsi_adapter cac_switch = {
-	cac_scsi_cmd, cacminphys, NULL, NULL, NULL
+	cac_scsi_cmd, cac_minphys, NULL, NULL, NULL
 };
 
 void	*cac_ccb_alloc(void *);
@@ -562,7 +562,7 @@ cac_get_dinfo(sc, target)
 }
 
 void
-cacminphys(struct buf *bp, struct scsi_link *sl)
+cac_minphys(struct buf *bp, struct scsi_link *sl)
 {
 	if (bp->b_bcount > CAC_MAX_XFER)
 		bp->b_bcount = CAC_MAX_XFER;
diff --git a/sys/dev/ic/ciss.c b/sys/dev/ic/ciss.c
index efb92008134..44cd8cead25 100644
--- a/sys/dev/ic/ciss.c
+++ b/sys/dev/ic/ciss.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ciss.c,v 1.79 2020/01/25 21:48:42 krw Exp $	*/
+/*	$OpenBSD: ciss.c,v 1.80 2020/01/26 00:53:31 krw Exp $	*/
 
 /*
  * Copyright (c) 2005,2006 Michael Shalayeff
@@ -68,10 +68,10 @@ struct cfdriver ciss_cd = {
 
 void	ciss_scsi_cmd(struct scsi_xfer *xs);
 int	ciss_scsi_ioctl(struct scsi_link *, u_long, caddr_t, int);
-void	cissminphys(struct buf *bp, struct scsi_link *sl);
+void	ciss_minphys(struct buf *bp, struct scsi_link *sl);
 
 struct scsi_adapter ciss_switch = {
-	ciss_scsi_cmd, cissminphys, NULL, NULL, ciss_scsi_ioctl
+	ciss_scsi_cmd, ciss_minphys, NULL, NULL, ciss_scsi_ioctl
 };
 
 #if NBIO > 0
@@ -423,7 +423,7 @@ ciss_shutdown(void *v)
 }
 
 void
-cissminphys(struct buf *bp, struct scsi_link *sl)
+ciss_minphys(struct buf *bp, struct scsi_link *sl)
 {
 #if 0	/* TODO */
 #define	CISS_MAXFER	(PAGE_SIZE * (sc->maxsg + 1))
diff --git a/sys/dev/ic/gdt_common.c b/sys/dev/ic/gdt_common.c
index 311352574d7..c37abb3b6a0 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.66 2020/01/25 21:48:42 krw Exp $	*/
+/*	$OpenBSD: gdt_common.c,v 1.67 2020/01/26 00:53:31 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, NULL, NULL, NULL
+	gdt_scsi_cmd, gdt_minphys, NULL, NULL, NULL
 };
 
 int gdt_cnt = 0;
@@ -1094,9 +1094,9 @@ gdt_intr(void *arg)
 }
 
 void
-gdtminphys(struct buf *bp, struct scsi_link *sl)
+gdt_minphys(struct buf *bp, struct scsi_link *sl)
 {
-	GDT_DPRINTF(GDT_D_MISC, ("gdtminphys(0x%x) ", bp));
+	GDT_DPRINTF(GDT_D_MISC, ("gdt_minphys(0x%x) ", bp));
 
 	/* As this is way more than MAXPHYS it's really not necessary. */
 	if ((GDT_MAXOFFSETS - 1) * PAGE_SIZE < MAXPHYS &&
diff --git a/sys/dev/ic/gdtvar.h b/sys/dev/ic/gdtvar.h
index ba50513e2c8..ec5e4b9d09a 100644
--- a/sys/dev/ic/gdtvar.h
+++ b/sys/dev/ic/gdtvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: gdtvar.h,v 1.22 2013/03/04 00:41:54 dlg Exp $	*/
+/*	$OpenBSD: gdtvar.h,v 1.23 2020/01/26 00:53:31 krw Exp $	*/
 
 /*
  * Copyright (c) 1999, 2000 Niklas Hallqvist.  All rights reserved.
@@ -236,7 +236,7 @@ struct gdt_softc {
 	int (*sc_test_busy)(struct gdt_softc *);
 };
 
-void	gdtminphys(struct buf *, struct scsi_link *);
+void	gdt_minphys(struct buf *, struct scsi_link *);
 int	gdt_attach(struct gdt_softc *);
 int	gdt_intr(void *);
 
diff --git a/sys/dev/ic/iha.c b/sys/dev/ic/iha.c
index 1678f01a4af..6e0a5d88c0e 100644
--- a/sys/dev/ic/iha.c
+++ b/sys/dev/ic/iha.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: iha.c,v 1.45 2020/01/25 21:48:42 krw Exp $ */
+/*	$OpenBSD: iha.c,v 1.46 2020/01/26 00:53:31 krw Exp $ */
 /*-------------------------------------------------------------------------
  *
  * Device driver for the INI-9XXXU/UW or INIC-940/950  PCI SCSI Controller.
@@ -446,7 +446,7 @@ iha_init_tulip(struct iha_softc *sc)
  * iha_minphys - reduce bp->b_bcount to something less than
  *		 or equal to the largest I/O possible through
  *		 the adapter. Called from higher layers
- *		 via sc->sc_adapter.scsi_minphys.
+ *		 via sc->sc_adapter.dev_minphys.
  */
 void
 iha_minphys(struct buf *bp, struct scsi_link *sl)
diff --git a/sys/dev/ic/mfi.c b/sys/dev/ic/mfi.c
index 35d1ed3e35c..e64b3b358c3 100644
--- a/sys/dev/ic/mfi.c
+++ b/sys/dev/ic/mfi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mfi.c,v 1.173 2020/01/25 21:48:42 krw Exp $ */
+/* $OpenBSD: mfi.c,v 1.174 2020/01/26 00:53:31 krw Exp $ */
 /*
  * Copyright (c) 2006 Marco Peereboom <marco@peereboom.us>
  *
@@ -58,17 +58,17 @@ struct cfdriver mfi_cd = {
 void	mfi_scsi_cmd(struct scsi_xfer *);
 int	mfi_scsi_ioctl(struct scsi_link *, u_long, caddr_t, int);
 int	mfi_ioctl_cache(struct scsi_link *, u_long,  struct dk_cache *);
-void	mfiminphys(struct buf *bp, struct scsi_link *sl);
+void	mfi_minphys(struct buf *bp, struct scsi_link *sl);
 
 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, NULL, NULL, mfi_scsi_ioctl
+	mfi_scsi_cmd, mfi_minphys, NULL, NULL, mfi_scsi_ioctl
 };
 
 struct scsi_adapter mfi_pd_switch = {
-	mfi_pd_scsi_cmd, mfiminphys, mfi_pd_scsi_probe, NULL, mfi_scsi_ioctl
+	mfi_pd_scsi_cmd, mfi_minphys, mfi_pd_scsi_probe, NULL, mfi_scsi_ioctl
 };
 
 void *		mfi_get_ccb(void *);
@@ -660,9 +660,9 @@ mfi_get_info(struct mfi_softc *sc)
 }
 
 void
-mfiminphys(struct buf *bp, struct scsi_link *sl)
+mfi_minphys(struct buf *bp, struct scsi_link *sl)
 {
-	DNPRINTF(MFI_D_MISC, "mfiminphys: %d\n", bp->b_bcount);
+	DNPRINTF(MFI_D_MISC, "mfi_minphys: %d\n", bp->b_bcount);
 
 	/* XXX currently using MFI_MAXFER = MAXPHYS */
 	if (bp->b_bcount > MFI_MAXFER)
diff --git a/sys/dev/ic/trm.c b/sys/dev/ic/trm.c
index 7f7c558d664..5fdf6ecffb0 100644
--- a/sys/dev/ic/trm.c
+++ b/sys/dev/ic/trm.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: trm.c,v 1.35 2020/01/25 21:48:42 krw Exp $
+/*	$OpenBSD: trm.c,v 1.36 2020/01/26 00:53:31 krw Exp $
  * ------------------------------------------------------------
  *   O.S       : OpenBSD
  *   File Name : trm.c
@@ -2430,7 +2430,7 @@ trm_initACB(struct trm_softc *sc, int unit)
 	}
 
 	sc->sc_adapter.scsi_cmd     = trm_scsi_cmd; 
-	sc->sc_adapter.scsi_minphys = trm_minphys;
+	sc->sc_adapter.dev_minphys  = trm_minphys;
 
 	sc->sc_link.adapter_softc    = sc;
 	sc->sc_link.adapter_target   = sc->sc_AdaptSCSIID;
diff --git a/sys/dev/ic/twe.c b/sys/dev/ic/twe.c
index 27fa7f09395..61637da28cb 100644
--- a/sys/dev/ic/twe.c
+++ b/sys/dev/ic/twe.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: twe.c,v 1.49 2020/01/25 21:48:42 krw Exp $	*/
+/*	$OpenBSD: twe.c,v 1.50 2020/01/26 00:53:31 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, NULL, NULL, NULL
+	twe_scsi_cmd, twe_minphys, NULL, NULL, NULL
 };
 
 void *twe_get_ccb(void *);
@@ -753,7 +753,7 @@ twe_done(sc, ccb)
 }
 
 void
-tweminphys(struct buf *bp, struct scsi_link *sl)
+twe_minphys(struct buf *bp, struct scsi_link *sl)
 {
 	if (bp->b_bcount > TWE_MAXFER)
 		bp->b_bcount = TWE_MAXFER;
diff --git a/sys/dev/ic/twevar.h b/sys/dev/ic/twevar.h
index 77203b1fdc2..4fe62116691 100644
--- a/sys/dev/ic/twevar.h
+++ b/sys/dev/ic/twevar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: twevar.h,v 1.10 2011/04/03 15:49:16 dlg Exp $	*/
+/*	$OpenBSD: twevar.h,v 1.11 2020/01/26 00:53:31 krw Exp $	*/
 
 /*
  * Copyright (c) 2000 Michael Shalayeff
@@ -87,6 +87,6 @@ struct twe_softc {
 #define TWE_UNLOCK(sc, lock) splx(lock)
 typedef int twe_lock_t;
 
-void	tweminphys(struct buf *bp, struct scsi_link *sl);
+void	twe_minphys(struct buf *bp, struct scsi_link *sl);
 int	twe_attach(struct twe_softc *);
 int	twe_intr(void *);
diff --git a/sys/dev/ic/uha.c b/sys/dev/ic/uha.c
index 2313c64f5ff..94863f0a31e 100644
--- a/sys/dev/ic/uha.c
+++ b/sys/dev/ic/uha.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uha.c,v 1.28 2020/01/25 21:48:42 krw Exp $	*/
+/*	$OpenBSD: uha.c,v 1.29 2020/01/26 00:53:31 krw Exp $	*/
 /*	$NetBSD: uha.c,v 1.3 1996/10/13 01:37:29 christos Exp $	*/
 
 #undef UHADEBUG
@@ -78,11 +78,11 @@
 void uha_reset_mscp(struct uha_softc *, struct uha_mscp *);
 void uha_mscp_free(void *, void *);
 void *uha_mscp_alloc(void *);
-void uhaminphys(struct buf *, struct scsi_link *);
+void uha_minphys(struct buf *, struct scsi_link *);
 void uha_scsi_cmd(struct scsi_xfer *);
 
 struct scsi_adapter uha_switch = {
-	uha_scsi_cmd, uhaminphys, NULL, NULL, NULL
+	uha_scsi_cmd, uha_minphys, NULL, NULL, NULL
 };
 
 struct cfdriver uha_cd = {
@@ -261,7 +261,7 @@ uha_done(sc, mscp)
 }
 
 void
-uhaminphys(struct buf *bp, struct scsi_link *sl)
+uha_minphys(struct buf *bp, struct scsi_link *sl)
 {
 	if (bp->b_bcount > ((UHA_NSEG - 1) << PGSHIFT))
 		bp->b_bcount = ((UHA_NSEG - 1) << PGSHIFT);