summaryrefslogtreecommitdiff
path: root/sys/dev/pci
diff options
context:
space:
mode:
authorDavid Gwynne <dlg@cvs.openbsd.org>2010-06-15 04:11:35 +0000
committerDavid Gwynne <dlg@cvs.openbsd.org>2010-06-15 04:11:35 +0000
commit66da2736a8ed4d9c0d71b175dfeb8aad21cb64e8 (patch)
tree30d3a9f901c2f235f5eeacb2ddfe5bb67869acc8 /sys/dev/pci
parent9d967ae028759ec5321cc878bb2965cfcfa7f873 (diff)
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@
Diffstat (limited to 'sys/dev/pci')
-rw-r--r--sys/dev/pci/ips.c8
-rw-r--r--sys/dev/pci/mpii.c8
2 files changed, 6 insertions, 10 deletions
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;