Nuke *_minphys() functions that either simply apply MAXPHYS or do

nothing at all. MAXPHYS will be applied in minphys() and nothing at
all, well, doesn't do anything.

Also remove any '#define <blah> MAXPHYS' statements used solely to
disguise MAXPHYS in said functions.

4 files changed, 8 insertions, 40 deletions

diff --git a/sys/dev/ic/ciss.c b/sys/dev/ic/ciss.c
index 44cd8cead25..522ea1a4aaa 100644
--- a/sys/dev/ic/ciss.c
+++ b/sys/dev/ic/ciss.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ciss.c,v 1.80 2020/01/26 00:53:31 krw Exp $	*/
+/*	$OpenBSD: ciss.c,v 1.81 2020/02/13 15:11:32 krw Exp $	*/
 
 /*
  * Copyright (c) 2005,2006 Michael Shalayeff
@@ -68,10 +68,9 @@ 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	ciss_minphys(struct buf *bp, struct scsi_link *sl);
 
 struct scsi_adapter ciss_switch = {
-	ciss_scsi_cmd, ciss_minphys, NULL, NULL, ciss_scsi_ioctl
+	ciss_scsi_cmd, NULL, NULL, NULL, ciss_scsi_ioctl
 };
 
 #if NBIO > 0
@@ -422,16 +421,6 @@ ciss_shutdown(void *v)
 	ciss_sync(sc);
 }
 
-void
-ciss_minphys(struct buf *bp, struct scsi_link *sl)
-{
-#if 0	/* TODO */
-#define	CISS_MAXFER	(PAGE_SIZE * (sc->maxsg + 1))
-	if (bp->b_bcount > CISS_MAXFER)
-		bp->b_bcount = CISS_MAXFER;
-#endif
-}
-
 /*
  * submit a command and optionally wait for completition.
  * wait arg abuses SCSI_POLL|SCSI_NOSLEEP flags to request
diff --git a/sys/dev/ic/mfi.c b/sys/dev/ic/mfi.c
index e64b3b358c3..04c69d13c22 100644
--- a/sys/dev/ic/mfi.c
+++ b/sys/dev/ic/mfi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mfi.c,v 1.174 2020/01/26 00:53:31 krw Exp $ */
+/* $OpenBSD: mfi.c,v 1.175 2020/02/13 15:11:32 krw Exp $ */
 /*
  * Copyright (c) 2006 Marco Peereboom <marco@peereboom.us>
  *
@@ -58,17 +58,16 @@ 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	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, mfi_minphys, NULL, NULL, mfi_scsi_ioctl
+	mfi_scsi_cmd, NULL, NULL, NULL, mfi_scsi_ioctl
 };
 
 struct scsi_adapter mfi_pd_switch = {
-	mfi_pd_scsi_cmd, mfi_minphys, mfi_pd_scsi_probe, NULL, mfi_scsi_ioctl
+	mfi_pd_scsi_cmd, NULL, mfi_pd_scsi_probe, NULL, mfi_scsi_ioctl
 };
 
 void *		mfi_get_ccb(void *);
@@ -659,16 +658,6 @@ mfi_get_info(struct mfi_softc *sc)
 	return (0);
 }
 
-void
-mfi_minphys(struct buf *bp, struct scsi_link *sl)
-{
-	DNPRINTF(MFI_D_MISC, "mfi_minphys: %d\n", bp->b_bcount);
-
-	/* XXX currently using MFI_MAXFER = MAXPHYS */
-	if (bp->b_bcount > MFI_MAXFER)
-		bp->b_bcount = MFI_MAXFER;
-}
-
 int
 mfi_attach(struct mfi_softc *sc, enum mfi_iop iop)
 {
diff --git a/sys/dev/ic/mfireg.h b/sys/dev/ic/mfireg.h
index 455b0fe3957..0513928bfa0 100644
--- a/sys/dev/ic/mfireg.h
+++ b/sys/dev/ic/mfireg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: mfireg.h,v 1.49 2018/05/18 05:17:40 jmatthew Exp $ */
+/* $OpenBSD: mfireg.h,v 1.50 2020/02/13 15:11:32 krw Exp $ */
 /*
  * Copyright (c) 2006 Marco Peereboom <marco@peereboom.us>
  *
@@ -27,7 +27,6 @@
 #define MFI_OSTS_GEN2_INTR_VALID		(0x00000001 | 0x00000004)
 #define MFI_INVALID_CTX				0xffffffff
 #define MFI_ENABLE_INTR				0x01
-#define MFI_MAXFER				MAXPHYS	/* XXX bogus */
 
 /* register offsets */
 #define MFI_IMSG0				0x10 /* inbound msg 0 */
diff --git a/sys/dev/ic/mpi.c b/sys/dev/ic/mpi.c
index 45f27fc36b8..276f540c9e2 100644
--- a/sys/dev/ic/mpi.c
+++ b/sys/dev/ic/mpi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mpi.c,v 1.211 2020/01/27 03:35:05 krw Exp $ */
+/*	$OpenBSD: mpi.c,v 1.212 2020/02/13 15:11:32 krw Exp $ */
 
 /*
  * Copyright (c) 2005, 2006, 2009 David Gwynne <dlg@openbsd.org>
@@ -64,13 +64,12 @@ struct cfdriver mpi_cd = {
 
 void			mpi_scsi_cmd(struct scsi_xfer *);
 void			mpi_scsi_cmd_done(struct mpi_ccb *);
-void			mpi_minphys(struct buf *, struct scsi_link *);
 int			mpi_scsi_probe(struct scsi_link *);
 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, NULL, mpi_scsi_probe, NULL, mpi_scsi_ioctl
 };
 
 struct mpi_dmamem	*mpi_dmamem_alloc(struct mpi_softc *, size_t);
@@ -1600,14 +1599,6 @@ mpi_load_xs(struct mpi_ccb *ccb)
 	return (0);
 }
 
-void
-mpi_minphys(struct buf *bp, struct scsi_link *sl)
-{
-	/* XXX */
-	if (bp->b_bcount > MAXPHYS)
-		bp->b_bcount = MAXPHYS;
-}
-
 int
 mpi_scsi_probe_virtual(struct scsi_link *link)
 {