dont pass the dev_t from the scsi device drivers into the midlayer for

ioctl requests, and dont pass the proc pointers around for any ioctl
requests in scsi land at all. neither were used, so trim the fat.

ok krw@ marco@

4 files changed, 12 insertions, 17 deletions

diff --git a/sys/dev/ic/ami.c b/sys/dev/ic/ami.c
index c205a5a050d..231787eb0a6 100644
--- a/sys/dev/ic/ami.c
+++ b/sys/dev/ic/ami.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ami.c,v 1.205 2010/06/03 12:04:39 dlg Exp $	*/
+/*	$OpenBSD: ami.c,v 1.206 2010/06/15 04:11:34 dlg Exp $	*/
 
 /*
  * Copyright (c) 2001 Michael Shalayeff
@@ -93,7 +93,7 @@ struct cfdriver ami_cd = {
 };
 
 void	ami_scsi_cmd(struct scsi_xfer *);
-int	ami_scsi_ioctl(struct scsi_link *, u_long, caddr_t, int, struct proc *);
+int	ami_scsi_ioctl(struct scsi_link *, u_long, caddr_t, int);
 void	amiminphys(struct buf *bp, struct scsi_link *sl);
 
 struct scsi_adapter ami_switch = {
@@ -1670,8 +1670,7 @@ ami_intr(void *v)
 }
 
 int
-ami_scsi_ioctl(struct scsi_link *link, u_long cmd, caddr_t addr, int flag,
-    struct proc *p)
+ami_scsi_ioctl(struct scsi_link *link, u_long cmd, caddr_t addr, int flag)
 {
 	struct ami_softc *sc = (struct ami_softc *)link->adapter_softc;
 	/* struct device *dev = (struct device *)link->device_softc; */
diff --git a/sys/dev/ic/ciss.c b/sys/dev/ic/ciss.c
index b30d9e77035..cbe017be7f5 100644
--- a/sys/dev/ic/ciss.c
+++ b/sys/dev/ic/ciss.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ciss.c,v 1.54 2010/06/03 01:03:55 dlg Exp $	*/
+/*	$OpenBSD: ciss.c,v 1.55 2010/06/15 04:11:34 dlg Exp $	*/
 
 /*
  * Copyright (c) 2005,2006 Michael Shalayeff
@@ -69,8 +69,7 @@ struct cfdriver ciss_cd = {
 };
 
 void	ciss_scsi_cmd(struct scsi_xfer *xs);
-int	ciss_scsi_ioctl(struct scsi_link *link, u_long cmd,
-    caddr_t addr, int flag, struct proc *p);
+int	ciss_scsi_ioctl(struct scsi_link *, u_long, caddr_t, int);
 void	cissminphys(struct buf *bp, struct scsi_link *sl);
 
 struct scsi_adapter ciss_switch = {
@@ -957,8 +956,7 @@ ciss_heartbeat(void *v)
 }
 
 int
-ciss_scsi_ioctl(struct scsi_link *link, u_long cmd,
-    caddr_t addr, int flag, struct proc *p)
+ciss_scsi_ioctl(struct scsi_link *link, u_long cmd, caddr_t addr, int flag)
 {
 #if NBIO > 0
 	return ciss_ioctl(link->adapter_softc, cmd, addr);
diff --git a/sys/dev/ic/mfi.c b/sys/dev/ic/mfi.c
index f5468d6a22c..5ff67943330 100644
--- a/sys/dev/ic/mfi.c
+++ b/sys/dev/ic/mfi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mfi.c,v 1.105 2010/05/20 00:55:17 krw Exp $ */
+/* $OpenBSD: mfi.c,v 1.106 2010/06/15 04:11:34 dlg Exp $ */
 /*
  * Copyright (c) 2006 Marco Peereboom <marco@peereboom.us>
  *
@@ -56,7 +56,7 @@ struct cfdriver mfi_cd = {
 };
 
 void	mfi_scsi_cmd(struct scsi_xfer *);
-int	mfi_scsi_ioctl(struct scsi_link *, u_long, caddr_t, int, struct proc *);
+int	mfi_scsi_ioctl(struct scsi_link *, u_long, caddr_t, int);
 void	mfiminphys(struct buf *bp, struct scsi_link *sl);
 
 struct scsi_adapter mfi_switch = {
@@ -1261,8 +1261,7 @@ mfi_mgmt_done(struct mfi_ccb *ccb)
 }
 
 int
-mfi_scsi_ioctl(struct scsi_link *link, u_long cmd, caddr_t addr, int flag,
-    struct proc *p)
+mfi_scsi_ioctl(struct scsi_link *link, u_long cmd, caddr_t addr, int flag)
 {
 	struct mfi_softc	*sc = (struct mfi_softc *)link->adapter_softc;
 
diff --git a/sys/dev/ic/mpi.c b/sys/dev/ic/mpi.c
index b5570fa1d0f..17e5a8ceae1 100644
--- a/sys/dev/ic/mpi.c
+++ b/sys/dev/ic/mpi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mpi.c,v 1.149 2010/05/19 07:26:01 dlg Exp $ */
+/*	$OpenBSD: mpi.c,v 1.150 2010/06/15 04:11:34 dlg Exp $ */
 
 /*
  * Copyright (c) 2005, 2006, 2009 David Gwynne <dlg@openbsd.org>
@@ -68,7 +68,7 @@ void			mpi_scsi_cmd_done(struct mpi_ccb *);
 void			mpi_minphys(struct buf *bp, struct scsi_link *sl);
 int			mpi_scsi_probe(struct scsi_link *);
 int			mpi_scsi_ioctl(struct scsi_link *, u_long, caddr_t,
-			    int, struct proc *);
+			    int);
 
 struct scsi_adapter mpi_switch = {
 	mpi_scsi_cmd,
@@ -2682,8 +2682,7 @@ mpi_req_cfg_page(struct mpi_softc *sc, u_int32_t address, int flags,
 }
 
 int
-mpi_scsi_ioctl(struct scsi_link *link, u_long cmd, caddr_t addr, int flag,
-    struct proc *p)
+mpi_scsi_ioctl(struct scsi_link *link, u_long cmd, caddr_t addr, int flag)
 {
 	struct mpi_softc	*sc = (struct mpi_softc *)link->adapter_softc;