summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/atapiscsi/atapiscsi.c10
-rw-r--r--sys/dev/ic/ami.c7
-rw-r--r--sys/dev/ic/ciss.c8
-rw-r--r--sys/dev/ic/mfi.c7
-rw-r--r--sys/dev/ic/mpi.c7
-rw-r--r--sys/dev/pci/ips.c8
-rw-r--r--sys/dev/pci/mpii.c8
-rw-r--r--sys/dev/softraid.c7
8 files changed, 25 insertions, 37 deletions
diff --git a/sys/dev/atapiscsi/atapiscsi.c b/sys/dev/atapiscsi/atapiscsi.c
index 11cb54ab0aa..3df124fd8cc 100644
--- a/sys/dev/atapiscsi/atapiscsi.c
+++ b/sys/dev/atapiscsi/atapiscsi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: atapiscsi.c,v 1.89 2010/05/20 00:55:17 krw Exp $ */
+/* $OpenBSD: atapiscsi.c,v 1.90 2010/06/15 04:11:34 dlg Exp $ */
/*
* This code is derived from code with the copyright below.
@@ -165,8 +165,7 @@ struct atapiscsi_softc {
};
void wdc_atapi_minphys(struct buf *bp, struct scsi_link *sl);
-int wdc_atapi_ioctl(struct scsi_link *,
- u_long, caddr_t, int, struct proc *);
+int wdc_atapi_ioctl(struct scsi_link *, u_long, caddr_t, int);
void wdc_atapi_send_cmd(struct scsi_xfer *sc_xfer);
static struct scsi_adapter atapiscsi_switch =
@@ -437,12 +436,11 @@ wdc_atapi_minphys (struct buf *bp, struct scsi_link *sl)
}
int
-wdc_atapi_ioctl (sc_link, cmd, addr, flag, p)
+wdc_atapi_ioctl (sc_link, cmd, addr, flag)
struct scsi_link *sc_link;
u_long cmd;
caddr_t addr;
int flag;
- struct proc *p;
{
struct atapiscsi_softc *as = sc_link->adapter_softc;
struct channel_softc *chp = as->chp;
@@ -451,7 +449,7 @@ wdc_atapi_ioctl (sc_link, cmd, addr, flag, p)
if (sc_link->target != 0)
return ENOTTY;
- return (wdc_ioctl(drvp, cmd, addr, flag, p));
+ return (wdc_ioctl(drvp, cmd, addr, flag, curproc));
}
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;
diff --git a/sys/dev/pci/ips.c b/sys/dev/pci/ips.c
index 0f24edff8da..55257c7aa90 100644
--- a/sys/dev/pci/ips.c
+++ b/sys/dev/pci/ips.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ips.c,v 1.97 2010/05/20 00:55:17 krw Exp $ */
+/* $OpenBSD: ips.c,v 1.98 2010/06/15 04:11:34 dlg Exp $ */
/*
* Copyright (c) 2006, 2007, 2009 Alexander Yurchenko <grange@openbsd.org>
@@ -429,8 +429,7 @@ void ips_attach(struct device *, struct device *, void *);
void ips_scsi_cmd(struct scsi_xfer *);
void ips_scsi_pt_cmd(struct scsi_xfer *);
-int ips_scsi_ioctl(struct scsi_link *, u_long, caddr_t, int,
- struct proc *);
+int ips_scsi_ioctl(struct scsi_link *, u_long, caddr_t, int);
#if NBIO > 0
int ips_ioctl(struct device *, u_long, caddr_t);
@@ -1101,8 +1100,7 @@ ips_scsi_pt_cmd(struct scsi_xfer *xs)
}
int
-ips_scsi_ioctl(struct scsi_link *link, u_long cmd, caddr_t addr, int flag,
- struct proc *p)
+ips_scsi_ioctl(struct scsi_link *link, u_long cmd, caddr_t addr, int flag)
{
#if NBIO > 0
return (ips_ioctl(link->adapter_softc, cmd, addr));
diff --git a/sys/dev/pci/mpii.c b/sys/dev/pci/mpii.c
index 4c9657d849a..79d536199b7 100644
--- a/sys/dev/pci/mpii.c
+++ b/sys/dev/pci/mpii.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mpii.c,v 1.19 2010/05/26 17:46:31 marco Exp $ */
+/* $OpenBSD: mpii.c,v 1.20 2010/06/15 04:11:34 dlg Exp $ */
/*
* Copyright (c) 2010 Mike Belopuhov <mkb@crypt.org.ru>
* Copyright (c) 2009 James Giannoules
@@ -1961,8 +1961,7 @@ struct cfdriver mpii_cd = {
void mpii_scsi_cmd(struct scsi_xfer *);
void mpii_scsi_cmd_done(struct mpii_ccb *);
int mpii_scsi_probe(struct scsi_link *);
-int mpii_scsi_ioctl(struct scsi_link *, u_long, caddr_t,
- int, struct proc *);
+int mpii_scsi_ioctl(struct scsi_link *, u_long, caddr_t, int);
struct scsi_adapter mpii_switch = {
mpii_scsi_cmd,
@@ -4571,8 +4570,7 @@ mpii_scsi_cmd_done(struct mpii_ccb *ccb)
}
int
-mpii_scsi_ioctl(struct scsi_link *link, u_long cmd, caddr_t addr, int flag,
- struct proc *p)
+mpii_scsi_ioctl(struct scsi_link *link, u_long cmd, caddr_t addr, int flag)
{
struct mpii_softc *sc = (struct mpii_softc *)link->adapter_softc;
diff --git a/sys/dev/softraid.c b/sys/dev/softraid.c
index 94b2f427d14..c679eb27ce0 100644
--- a/sys/dev/softraid.c
+++ b/sys/dev/softraid.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: softraid.c,v 1.204 2010/05/21 20:52:38 marco Exp $ */
+/* $OpenBSD: softraid.c,v 1.205 2010/06/15 04:11:34 dlg Exp $ */
/*
* Copyright (c) 2007, 2008, 2009 Marco Peereboom <marco@peereboom.us>
* Copyright (c) 2008 Chris Kuethe <ckuethe@openbsd.org>
@@ -93,7 +93,7 @@ void sr_minphys(struct buf *bp, struct scsi_link *sl);
void sr_copy_internal_data(struct scsi_xfer *,
void *, size_t);
int sr_scsi_ioctl(struct scsi_link *, u_long,
- caddr_t, int, struct proc *);
+ caddr_t, int);
int sr_ioctl(struct device *, u_long, caddr_t);
int sr_ioctl_inq(struct sr_softc *, struct bioc_inq *);
int sr_ioctl_vol(struct sr_softc *, struct bioc_vol *);
@@ -1962,8 +1962,7 @@ complete:
sr_scsi_done(sd, xs);
}
int
-sr_scsi_ioctl(struct scsi_link *link, u_long cmd, caddr_t addr, int flag,
- struct proc *p)
+sr_scsi_ioctl(struct scsi_link *link, u_long cmd, caddr_t addr, int flag)
{
DNPRINTF(SR_D_IOCTL, "%s: sr_scsi_ioctl cmd: %#x\n",
DEVNAME((struct sr_softc *)link->adapter_softc), cmd);
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-16 16:24:26 +0000