summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sys/arch/sparc64/dev/vdsk.c12
-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
-rw-r--r--sys/scsi/cd.c4
-rw-r--r--sys/scsi/ch.c5
-rw-r--r--sys/scsi/scsi_ioctl.c10
-rw-r--r--sys/scsi/scsiconf.h8
-rw-r--r--sys/scsi/sd.c8
-rw-r--r--sys/scsi/ss.c5
-rw-r--r--sys/scsi/st.c4
-rw-r--r--sys/scsi/uk.c4
17 files changed, 46 insertions, 76 deletions
diff --git a/sys/arch/sparc64/dev/vdsk.c b/sys/arch/sparc64/dev/vdsk.c
index 7ca5691c404..9edd75d3a93 100644
--- a/sys/arch/sparc64/dev/vdsk.c
+++ b/sys/arch/sparc64/dev/vdsk.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vdsk.c,v 1.22 2010/05/22 19:55:42 kettenis Exp $ */
+/* $OpenBSD: vdsk.c,v 1.23 2010/06/15 04:11:34 dlg Exp $ */
/*
* Copyright (c) 2009 Mark Kettenis
*
@@ -203,7 +203,6 @@ void vdsk_send_rdx(struct vdsk_softc *);
void vdsk_scsi_cmd(struct scsi_xfer *);
int vdsk_dev_probe(struct scsi_link *);
void vdsk_dev_free(struct scsi_link *);
-int vdsk_ioctl(struct scsi_link *, u_long, caddr_t, int, struct proc *);
void vdsk_scsi_inq(struct scsi_xfer *);
void vdsk_scsi_inquiry(struct scsi_xfer *);
@@ -343,7 +342,6 @@ vdsk_attach(struct device *parent, struct device *self, void *aux)
sc->sc_switch.scsi_minphys = scsi_minphys;
sc->sc_switch.dev_probe = vdsk_dev_probe;
sc->sc_switch.dev_free = vdsk_dev_free;
- sc->sc_switch.ioctl = vdsk_ioctl;
sc->sc_link.device = &vdsk_device;
sc->sc_link.adapter = &sc->sc_switch;
@@ -1138,11 +1136,3 @@ vdsk_dev_free(struct scsi_link *link)
{
printf("%s\n", __func__);
}
-
-int
-vdsk_ioctl(struct scsi_link *link, u_long cmd, caddr_t addr, int flags,
- struct proc *p)
-{
- printf("%s\n", __func__);
- return (ENOTTY);
-}
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);
diff --git a/sys/scsi/cd.c b/sys/scsi/cd.c
index 649c6c12936..b721935f8b8 100644
--- a/sys/scsi/cd.c
+++ b/sys/scsi/cd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cd.c,v 1.170 2010/06/11 12:02:44 krw Exp $ */
+/* $OpenBSD: cd.c,v 1.171 2010/06/15 04:11:34 dlg Exp $ */
/* $NetBSD: cd.c,v 1.100 1997/04/02 02:29:30 mycroft Exp $ */
/*
@@ -1135,7 +1135,7 @@ cdioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct proc *p)
error = ENOTTY;
break;
}
- error = scsi_do_ioctl(sc->sc_link, dev, cmd, addr, flag, p);
+ error = scsi_do_ioctl(sc->sc_link, cmd, addr, flag);
break;
}
diff --git a/sys/scsi/ch.c b/sys/scsi/ch.c
index 29bb2211dee..35e1ce80e63 100644
--- a/sys/scsi/ch.c
+++ b/sys/scsi/ch.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ch.c,v 1.37 2009/01/10 21:36:49 beck Exp $ */
+/* $OpenBSD: ch.c,v 1.38 2010/06/15 04:11:34 dlg Exp $ */
/* $NetBSD: ch.c,v 1.26 1997/02/21 22:06:52 thorpej Exp $ */
/*
@@ -345,8 +345,7 @@ chioctl(dev, cmd, data, flags, p)
/* Implement prevent/allow? */
default:
- error = scsi_do_ioctl(sc->sc_link, dev, cmd, data,
- flags, p);
+ error = scsi_do_ioctl(sc->sc_link, cmd, data, flags);
break;
}
diff --git a/sys/scsi/scsi_ioctl.c b/sys/scsi/scsi_ioctl.c
index 00114169853..1af19624821 100644
--- a/sys/scsi/scsi_ioctl.c
+++ b/sys/scsi/scsi_ioctl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: scsi_ioctl.c,v 1.41 2010/04/23 01:39:05 dlg Exp $ */
+/* $OpenBSD: scsi_ioctl.c,v 1.42 2010/06/15 04:11:34 dlg Exp $ */
/* $NetBSD: scsi_ioctl.c,v 1.23 1996/10/12 23:23:17 christos Exp $ */
/*
@@ -44,7 +44,6 @@
#include <sys/file.h>
#include <sys/malloc.h>
#include <sys/buf.h>
-#include <sys/proc.h>
#include <sys/device.h>
#include <sys/fcntl.h>
@@ -277,12 +276,9 @@ err:
* Something (e.g. another driver) has called us
* with an sc_link for a target/lun/adapter, and a scsi
* specific ioctl to perform, better try.
- * If user-level type command, we must still be running
- * in the context of the calling process
*/
int
-scsi_do_ioctl(struct scsi_link *sc_link, dev_t dev, u_long cmd, caddr_t addr,
- int flag, struct proc *p)
+scsi_do_ioctl(struct scsi_link *sc_link, u_long cmd, caddr_t addr, int flag)
{
SC_DEBUG(sc_link, SDEV_DB2, ("scsi_do_ioctl(0x%lx)\n", cmd));
@@ -313,7 +309,7 @@ scsi_do_ioctl(struct scsi_link *sc_link, dev_t dev, u_long cmd, caddr_t addr,
default:
if (sc_link->adapter->ioctl)
return ((sc_link->adapter->ioctl)(sc_link, cmd, addr,
- flag, p));
+ flag));
else
return (ENOTTY);
}
diff --git a/sys/scsi/scsiconf.h b/sys/scsi/scsiconf.h
index 32c9b9b4be3..05563b69cca 100644
--- a/sys/scsi/scsiconf.h
+++ b/sys/scsi/scsiconf.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: scsiconf.h,v 1.126 2010/06/14 10:03:34 thib Exp $ */
+/* $OpenBSD: scsiconf.h,v 1.127 2010/06/15 04:11:34 dlg Exp $ */
/* $NetBSD: scsiconf.h,v 1.35 1997/04/02 02:29:38 mycroft Exp $ */
/*
@@ -308,8 +308,7 @@ struct scsi_adapter {
void (*scsi_minphys)(struct buf *, struct scsi_link *);
int (*dev_probe)(struct scsi_link *);
void (*dev_free)(struct scsi_link *);
- int (*ioctl)(struct scsi_link *, u_long, caddr_t, int,
- struct proc *);
+ int (*ioctl)(struct scsi_link *, u_long, caddr_t, int);
};
/*
@@ -590,8 +589,7 @@ void scsi_done(struct scsi_xfer *);
int scsi_scsi_cmd(struct scsi_link *, struct scsi_generic *,
int cmdlen, u_char *data_addr, int datalen, int retries,
int timeout, struct buf *bp, int flags);
-int scsi_do_ioctl(struct scsi_link *, dev_t, u_long, caddr_t,
- int, struct proc *);
+int scsi_do_ioctl(struct scsi_link *, u_long, caddr_t, int);
void sc_print_addr(struct scsi_link *);
int scsi_report_luns(struct scsi_link *, int,
struct scsi_report_luns_data *, u_int32_t, int, int);
diff --git a/sys/scsi/sd.c b/sys/scsi/sd.c
index 4bb4df1d0a7..25e35c00f1c 100644
--- a/sys/scsi/sd.c
+++ b/sys/scsi/sd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sd.c,v 1.193 2010/06/11 12:02:44 krw Exp $ */
+/* $OpenBSD: sd.c,v 1.194 2010/06/15 04:11:34 dlg Exp $ */
/* $NetBSD: sd.c,v 1.111 1997/04/02 02:29:41 mycroft Exp $ */
/*-
@@ -957,7 +957,7 @@ sdioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct proc *p)
goto exit;
case DIOCINQ:
- error = scsi_do_ioctl(sc->sc_link, dev, cmd, addr, flag, p);
+ error = scsi_do_ioctl(sc->sc_link, cmd, addr, flag);
if (error == ENOTTY)
error = sd_ioctl_inquiry(sc,
(struct dk_inquiry *)addr);
@@ -965,7 +965,7 @@ sdioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct proc *p)
case DIOCGCACHE:
case DIOCSCACHE:
- error = scsi_do_ioctl(sc->sc_link, dev, cmd, addr, flag, p);
+ error = scsi_do_ioctl(sc->sc_link, cmd, addr, flag);
if (error == ENOTTY)
error = sd_ioctl_cache(sc, cmd,
(struct dk_cache *)addr);
@@ -976,7 +976,7 @@ sdioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct proc *p)
error = ENOTTY;
goto exit;
}
- error = scsi_do_ioctl(sc->sc_link, dev, cmd, addr, flag, p);
+ error = scsi_do_ioctl(sc->sc_link, cmd, addr, flag);
}
exit:
diff --git a/sys/scsi/ss.c b/sys/scsi/ss.c
index 2b3fcaa9752..c48e14c80f4 100644
--- a/sys/scsi/ss.c
+++ b/sys/scsi/ss.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ss.c,v 1.73 2010/06/11 12:02:44 krw Exp $ */
+/* $OpenBSD: ss.c,v 1.74 2010/06/15 04:11:34 dlg Exp $ */
/* $NetBSD: ss.c,v 1.10 1996/05/05 19:52:55 christos Exp $ */
/*
@@ -788,8 +788,7 @@ ssioctl(dev, cmd, addr, flag, p)
default:
if (SSMODE(dev) != MODE_CONTROL)
return (ENOTTY);
- return (scsi_do_ioctl(ss->sc_link, dev, cmd, addr,
- flag, p));
+ return (scsi_do_ioctl(ss->sc_link, cmd, addr, flag));
}
return (error);
}
diff --git a/sys/scsi/st.c b/sys/scsi/st.c
index 203b5e24631..fe5172c061f 100644
--- a/sys/scsi/st.c
+++ b/sys/scsi/st.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: st.c,v 1.96 2010/06/11 12:02:44 krw Exp $ */
+/* $OpenBSD: st.c,v 1.97 2010/06/15 04:11:34 dlg Exp $ */
/* $NetBSD: st.c,v 1.71 1997/02/21 23:03:49 thorpej Exp $ */
/*
@@ -1357,7 +1357,7 @@ stioctl(dev_t dev, u_long cmd, caddr_t arg, int flag, struct proc *p)
#endif
default:
- error = scsi_do_ioctl(st->sc_link, dev, cmd, arg, flag, p);
+ error = scsi_do_ioctl(st->sc_link, cmd, arg, flag);
break;
}
goto done;
diff --git a/sys/scsi/uk.c b/sys/scsi/uk.c
index dbf36eb312b..96c9347b387 100644
--- a/sys/scsi/uk.c
+++ b/sys/scsi/uk.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uk.c,v 1.13 2007/11/27 16:22:14 martynas Exp $ */
+/* $OpenBSD: uk.c,v 1.14 2010/06/15 04:11:34 dlg Exp $ */
/* $NetBSD: uk.c,v 1.15 1996/03/17 00:59:57 thorpej Exp $ */
/*
@@ -160,5 +160,5 @@ ukioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct proc *p)
{
struct uk_softc *uk = uk_cd.cd_devs[UKUNIT(dev)];
- return (scsi_do_ioctl(uk->sc_link, dev, cmd, addr, flag, p));
+ return (scsi_do_ioctl(uk->sc_link, cmd, addr, flag));
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-29 07:13:16 +0000