diff options
| author | Alan Cox <alan@lxorguk.ukuu.org.uk> | 2008-05-22 22:04:48 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-07-21 15:16:18 -0700 |
| commit | 1160d0765660e14b44dffd931b28a3875d5d9e46 (patch) | |
| tree | af822452845bb1335d4b0255976bf00241d32354 | |
| parent | 44c389a00ff7229ab2f2aab22ce03ae0c9037df7 (diff) | |
| download | blackbird-op-linux-1160d0765660e14b44dffd931b28a3875d5d9e46.tar.gz blackbird-op-linux-1160d0765660e14b44dffd931b28a3875d5d9e46.zip | |
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>
| -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) } -#define FTDI_ELAN_IOC_MAGIC 0xA1 -#define FTDI_ELAN_IOCDEBUG _IOC(_IOC_WRITE, FTDI_ELAN_IOC_MAGIC, 1, 132) -static int ftdi_elan_ioctl(struct inode *inode, struct file *file, - unsigned int cmd, unsigned long arg) -{ - switch (cmd) { - case FTDI_ELAN_IOCDEBUG:{ - char line[132]; - int size = strncpy_from_user(line, - (const char __user *)arg, sizeof(line)); - if (size < 0) { - return -EINVAL; - } else { - printk(KERN_ERR "TODO: ioctl %s\n", line); - return 0; - } - } - default: - return -EFAULT; - } -} - - /* * * blocking bulk reads are used to get data from the device @@ -1222,7 +1199,6 @@ error_1: static const struct file_operations ftdi_elan_fops = { .owner = THIS_MODULE, .llseek = no_llseek, - .ioctl = ftdi_elan_ioctl, .read = ftdi_elan_read, .write = ftdi_elan_write, .open = ftdi_elan_open, |
