From 09f89c7b7ca5ae64e834cf028e38a26440012e5f Mon Sep 17 00:00:00 2001
From: dlg <dlg@openbsd.org>
Date: Fri, 17 Jan 2014 22:20:32 +0000
Subject: [PATCH] replace aacminphys with scsi_minphys. both are just wrappers
 around minphys.

---
 sys/dev/ic/aac.c    | 21 ++++++---------------
 sys/dev/ic/aacvar.h |  3 +--
 2 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/sys/dev/ic/aac.c b/sys/dev/ic/aac.c
index 72f3441eb28..8b4b00182a3 100644
--- a/sys/dev/ic/aac.c
+++ b/sys/dev/ic/aac.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: aac.c,v 1.59 2014/01/17 22:18:27 dlg Exp $	*/
+/*	$OpenBSD: aac.c,v 1.60 2014/01/17 22:20:32 dlg Exp $	*/
 
 /*-
  * Copyright (c) 2000 Michael Smith
@@ -131,7 +131,11 @@ struct cfdriver aac_cd = {
 };
 
 struct scsi_adapter aac_switch = {
-	aac_scsi_cmd, aacminphys, 0, 0,
+	aac_scsi_cmd,
+	scsi_minphys,
+	NULL,		/* probe */
+	NULL,		/* free */
+	NULL		/* ioctl */
 };
 
 /* Falcon/PPC interface */
@@ -2468,19 +2472,6 @@ aac_internal_cache_cmd(struct scsi_xfer *xs)
 	xs->error = XS_NOERROR;
 }
 
-void
-aacminphys(struct buf *bp, struct scsi_link *sl)
-{
-	AAC_DPRINTF(AAC_D_MISC, ("aacminphys(0x%x)\n", bp));
-
-#if 0	/* As this is way more than MAXPHYS it's really not necessary. */
-	if (bp->b_bcount > ((AAC_MAXOFFSETS - 1) * PAGE_SIZE))
-		bp->b_bcount = ((AAC_MAXOFFSETS - 1) * PAGE_SIZE);
-#endif
-
-	minphys(bp);
-}
-
 void
 aac_scsi_cmd(struct scsi_xfer *xs)
 {
diff --git a/sys/dev/ic/aacvar.h b/sys/dev/ic/aacvar.h
index a08e021f1a8..4b40a0e8935 100644
--- a/sys/dev/ic/aacvar.h
+++ b/sys/dev/ic/aacvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: aacvar.h,v 1.10 2014/01/17 22:18:27 dlg Exp $	*/
+/*	$OpenBSD: aacvar.h,v 1.11 2014/01/17 22:20:32 dlg Exp $	*/
 
 /*-
  * Copyright (c) 2000 Michael Smith
@@ -426,7 +426,6 @@ struct aac_softc
 	void			*aac_sdh;
 };
 
-void	aacminphys(struct buf *, struct scsi_link *);
 int	aac_attach(struct aac_softc *);
 int	aac_intr(void *);
 
-- 
2.20.1