From: Thomas Gleixner Date: Thu, 15 Oct 2009 20:28:53 +0000 (+0000) Subject: Bluetooth: Remove stub ioctl in hci_vhci X-Git-Tag: v2.6.33-rc1~388^2~17^2~16 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5990108cfcd3eb2d365c9ea6f82318be80c4e9d3;p=platform%2Fupstream%2Fkernel-adaptation-pc.git Bluetooth: Remove stub ioctl in hci_vhci Remove the empty ioctl which just returns -EINVAL. vfs_ioctl() will return -ENOTTY instead, but I doubt that any application will notice the difference :) Signed-off-by: Thomas Gleixner Signed-off-by: Marcel Holtmann --- diff --git a/drivers/bluetooth/hci_vhci.c b/drivers/bluetooth/hci_vhci.c index d5cde6d..ff02e90 100644 --- a/drivers/bluetooth/hci_vhci.c +++ b/drivers/bluetooth/hci_vhci.c @@ -218,12 +218,6 @@ 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) -{ - return -EINVAL; -} - static int vhci_open(struct inode *inode, struct file *file) { struct vhci_data *data; @@ -287,7 +281,6 @@ static const struct file_operations vhci_fops = { .read = vhci_read, .write = vhci_write, .poll = vhci_poll, - .ioctl = vhci_ioctl, .open = vhci_open, .release = vhci_release, };