9 files changed, 12 insertions, 58 deletions
diff --git a/sys/arch/mvme68k/dev/sbic.c b/sys/arch/mvme68k/dev/sbic.c
index 624f48722ce..b6a5dc9c3da 100644
--- a/sys/arch/mvme68k/dev/sbic.c
+++ b/sys/arch/mvme68k/dev/sbic.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sbic.c,v 1.21 2008/11/25 17:52:02 krw Exp $ */
+/*	$OpenBSD: sbic.c,v 1.22 2009/02/16 21:19:06 miod Exp $ */
 /*	$NetBSD: sbic.c,v 1.2 1996/04/23 16:32:54 chuck Exp $	*/
 
 /*
@@ -151,21 +151,6 @@ void    sbictimeout(struct sbic_softc *dev);
 #define QPRINTF(a)  /* */
 #endif
 
-
-/*
- * default minphys routine for sbic based controllers
- */
-void
-sbic_minphys(bp)
-    struct buf *bp;
-{
-    /*
-     * No max transfer at this level.
-     */
-    minphys(bp);
-}
-
-
 /*
  * Save DMA pointers.  Take into account partial transfer. Shut down DMA.
  */
diff --git a/sys/arch/mvme68k/dev/sbicvar.h b/sys/arch/mvme68k/dev/sbicvar.h
index 44875db2c43..3c6ae68de1a 100644
--- a/sys/arch/mvme68k/dev/sbicvar.h
+++ b/sys/arch/mvme68k/dev/sbicvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sbicvar.h,v 1.7 2004/07/02 17:57:29 miod Exp $ */
+/*	$OpenBSD: sbicvar.h,v 1.8 2009/02/16 21:19:06 miod Exp $ */
 
 /*
  * Copyright (c) 1990 The Regents of the University of California.
@@ -196,7 +196,6 @@ struct  sbic_softc {
 struct buf;
 struct scsi_xfer;
 
-void sbic_minphys(struct buf *bp);
 int sbic_scsicmd(struct scsi_xfer *);
 
 #endif /* _SBICVAR_H_ */
diff --git a/sys/arch/mvme68k/dev/ssh.c b/sys/arch/mvme68k/dev/ssh.c
index 55161447cb1..2ee25ce6200 100644
--- a/sys/arch/mvme68k/dev/ssh.c
+++ b/sys/arch/mvme68k/dev/ssh.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ssh.c,v 1.20 2008/11/25 17:52:02 krw Exp $ */
+/*	$OpenBSD: ssh.c,v 1.21 2009/02/16 21:19:06 miod Exp $ */
 
 /*
  * Copyright (c) 1994 Michael L. Hitch
@@ -126,21 +126,6 @@ int   ssh_trix;
 #define SSH_TRACE(a,b,c,d)
 #endif
 
-
-/*
- * default minphys routine for ssh based controllers
- */
-void
-ssh_minphys(bp)
-struct buf *bp;
-{
-
-	/*
-	 * No max transfer at this level.
-	 */
-	minphys(bp);
-}
-
 /*
  * used by specific ssh controller
  *
diff --git a/sys/arch/mvme68k/dev/sshdma.c b/sys/arch/mvme68k/dev/sshdma.c
index e1dc51c78d1..487aa1ee74e 100644
--- a/sys/arch/mvme68k/dev/sshdma.c
+++ b/sys/arch/mvme68k/dev/sshdma.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sshdma.c,v 1.14 2006/11/28 23:59:45 dlg Exp $ */
+/*	$OpenBSD: sshdma.c,v 1.15 2009/02/16 21:19:06 miod Exp $ */
 
 /*
  * Copyright (c) 1995 Theo de Raadt
@@ -65,7 +65,7 @@ extern void sshinitialize(struct ssh_softc *);
 
 struct scsi_adapter afsc_scsiswitch = {
 	ssh_scsicmd,
-	ssh_minphys,
+	scsi_minphys,
 	0,			/* no lun support */
 	0,			/* no lun support */
 };
diff --git a/sys/arch/mvme68k/dev/sshvar.h b/sys/arch/mvme68k/dev/sshvar.h
index 9160fc30d55..dc6696c741f 100644
--- a/sys/arch/mvme68k/dev/sshvar.h
+++ b/sys/arch/mvme68k/dev/sshvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sshvar.h,v 1.5 2004/07/30 22:29:45 miod Exp $ */
+/*	$OpenBSD: sshvar.h,v 1.6 2009/02/16 21:19:06 miod Exp $ */
 
 /*
  * Copyright (c) 1995 Theo de Raadt
@@ -192,7 +192,6 @@ struct	ssh_softc {
 #define	STS_INTERMED	0x10	/* Intermediate status sent */
 #define	STS_EXT		0x80	/* Extended status valid */
 
-void ssh_minphys(struct buf *bp);
 int ssh_scsicmd(struct scsi_xfer *);
 
 #endif /* _SSHVAR_H */
diff --git a/sys/arch/mvme68k/dev/vs.c b/sys/arch/mvme68k/dev/vs.c
index f97f42753dc..042d96f4819 100644
--- a/sys/arch/mvme68k/dev/vs.c
+++ b/sys/arch/mvme68k/dev/vs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vs.c,v 1.26 2008/11/25 17:52:02 krw Exp $ */
+/*	$OpenBSD: vs.c,v 1.27 2009/02/16 21:19:06 miod Exp $ */
 
 /*
  * Copyright (c) 1999 Steve Murphree, Jr.
@@ -125,19 +125,6 @@ szero(src, cnt)
 	}
 }
 
-/*
- * default minphys routine for MVME328 based controllers
- */
-void
-vs_minphys(bp)
-	struct buf *bp;
-{
-	/*
-	 * No max transfer at this level.
-	 */
-	minphys(bp);
-}
-
 int
 do_vspoll(sc, to, canreset)
 	struct vs_softc *sc;
diff --git a/sys/arch/mvme68k/dev/vsdma.c b/sys/arch/mvme68k/dev/vsdma.c
index 808d09f92a7..bafcef817a2 100644
--- a/sys/arch/mvme68k/dev/vsdma.c
+++ b/sys/arch/mvme68k/dev/vsdma.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vsdma.c,v 1.12 2006/11/28 23:59:45 dlg Exp $ */
+/*	$OpenBSD: vsdma.c,v 1.13 2009/02/16 21:19:06 miod Exp $ */
 /*
  * Copyright (c) 1999 Steve Murphree, Jr.
  * All rights reserved.
@@ -62,7 +62,7 @@ int	vs_eintr(void *);
 
 struct scsi_adapter vs_scsiswitch = {
 	vs_scsicmd,
-	vs_minphys,
+	scsi_minphys,
 	0,			/* no lun support */
 	0,			/* no lun support */
 };
diff --git a/sys/arch/mvme68k/dev/vsvar.h b/sys/arch/mvme68k/dev/vsvar.h
index a0f8b44c1c3..6b0f3afcb7b 100644
--- a/sys/arch/mvme68k/dev/vsvar.h
+++ b/sys/arch/mvme68k/dev/vsvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vsvar.h,v 1.6 2004/07/30 22:29:45 miod Exp $ */
+/*	$OpenBSD: vsvar.h,v 1.7 2009/02/16 21:19:06 miod Exp $ */
 /*
  * Copyright (c) 1999 Steve Murphree, Jr.
  * Copyright (c) 1990 The Regents of the University of California.
@@ -120,7 +120,6 @@ struct	vs_softc {
 #define WQO_RFWQ           0x0020   /* report frozen work queue bit */
 #define WQO_INIT           0x8000   /* work queue init bit */
 
-void vs_minphys(struct buf *bp);
 int vs_scsicmd(struct scsi_xfer *);
 
 #endif /* _M328VAR_H */
diff --git a/sys/arch/mvme68k/dev/wdsc.c b/sys/arch/mvme68k/dev/wdsc.c
index 3771f529d64..296447b434f 100644
--- a/sys/arch/mvme68k/dev/wdsc.c
+++ b/sys/arch/mvme68k/dev/wdsc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wdsc.c,v 1.15 2008/07/30 18:08:03 miod Exp $ */
+/*	$OpenBSD: wdsc.c,v 1.16 2009/02/16 21:19:06 miod Exp $ */
 
 /*
  * Copyright (c) 1996 Steve Woodford
@@ -59,7 +59,7 @@ extern int sbicintr(struct sbic_softc *);
 
 struct scsi_adapter wdsc_scsiswitch = {
 	sbic_scsicmd,
-	sbic_minphys,
+	scsi_minphys,
 	0,          /* no lun support */
 	0,          /* no lun support */
 };