* [PATCH] bluetooth: kill unneeded use of BKL ioctl
@ 2009-10-13 15:54 Alan Cox
0 siblings, 0 replies; only message in thread
From: Alan Cox @ 2009-10-13 15:54 UTC (permalink / raw)
To: linux-kernel
If we just return -EINVAL then locking really doesn't matter
Signed-off-by: Alan Cox <alan@linux.intel.com>
---
drivers/bluetooth/hci_vhci.c | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/bluetooth/hci_vhci.c b/drivers/bluetooth/hci_vhci.c
index d5cde6d..7dc94a5 100644
--- a/drivers/bluetooth/hci_vhci.c
+++ b/drivers/bluetooth/hci_vhci.c
@@ -218,8 +218,7 @@ static unsigned int vhci_poll(struct file *file, poll_table *wait)
return POLLOUT | POLLWRNORM;
}
-static int vhci_ioctl(struct inode *inode, struct file *file,
- unsigned int cmd, unsigned long arg)
+static long vhci_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
{
return -EINVAL;
}
@@ -287,7 +286,7 @@ static const struct file_operations vhci_fops = {
.read = vhci_read,
.write = vhci_write,
.poll = vhci_poll,
- .ioctl = vhci_ioctl,
+ .unlocked_ioctl = vhci_ioctl,
.open = vhci_open,
.release = vhci_release,
};
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2009-10-13 16:06 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-10-13 15:54 [PATCH] bluetooth: kill unneeded use of BKL ioctl Alan Cox
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®