diff options
author | Alan Cox <alan@lxorguk.ukuu.org.uk> | 2008-05-22 17:04:48 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-07-21 18:16:18 -0400 |
commit | 1160d0765660e14b44dffd931b28a3875d5d9e46 (patch) | |
tree | af822452845bb1335d4b0255976bf00241d32354 /drivers/usb/misc | |
parent | 44c389a00ff7229ab2f2aab22ce03ae0c9037df7 (diff) |
USB: ftdi_usb: Eliminate ioctl and BKL ioctl use
ftdi has one ioctl, which is buggy and for debugging. Kill it off
Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/misc')
-rw-r--r-- | drivers/usb/misc/ftdi-elan.c | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/drivers/usb/misc/ftdi-elan.c b/drivers/usb/misc/ftdi-elan.c index ec88b3bfee46..97c280971532 100644 --- a/drivers/usb/misc/ftdi-elan.c +++ b/drivers/usb/misc/ftdi-elan.c | |||
@@ -656,29 +656,6 @@ static int ftdi_elan_release(struct inode *inode, struct file *file) | |||
656 | } | 656 | } |
657 | 657 | ||
658 | 658 | ||
659 | #define FTDI_ELAN_IOC_MAGIC 0xA1 | ||
660 | #define FTDI_ELAN_IOCDEBUG _IOC(_IOC_WRITE, FTDI_ELAN_IOC_MAGIC, 1, 132) | ||
661 | static int ftdi_elan_ioctl(struct inode *inode, struct file *file, | ||
662 | unsigned int cmd, unsigned long arg) | ||
663 | { | ||
664 | switch (cmd) { | ||
665 | case FTDI_ELAN_IOCDEBUG:{ | ||
666 | char line[132]; | ||
667 | int size = strncpy_from_user(line, | ||
668 | (const char __user *)arg, sizeof(line)); | ||
669 | if (size < 0) { | ||
670 | return -EINVAL; | ||
671 | } else { | ||
672 | printk(KERN_ERR "TODO: ioctl %s\n", line); | ||
673 | return 0; | ||
674 | } | ||
675 | } | ||
676 | default: | ||
677 | return -EFAULT; | ||
678 | } | ||
679 | } | ||
680 | |||
681 | |||
682 | /* | 659 | /* |
683 | * | 660 | * |
684 | * blocking bulk reads are used to get data from the device | 661 | * blocking bulk reads are used to get data from the device |
@@ -1222,7 +1199,6 @@ error_1: | |||
1222 | static const struct file_operations ftdi_elan_fops = { | 1199 | static const struct file_operations ftdi_elan_fops = { |
1223 | .owner = THIS_MODULE, | 1200 | .owner = THIS_MODULE, |
1224 | .llseek = no_llseek, | 1201 | .llseek = no_llseek, |
1225 | .ioctl = ftdi_elan_ioctl, | ||
1226 | .read = ftdi_elan_read, | 1202 | .read = ftdi_elan_read, |
1227 | .write = ftdi_elan_write, | 1203 | .write = ftdi_elan_write, |
1228 | .open = ftdi_elan_open, | 1204 | .open = ftdi_elan_open, |