Commit 1160d076 authored by Alan Cox's avatar Alan Cox Committed by Greg Kroah-Hartman

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: default avatarAlan Cox <alan@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 44c389a0
...@@ -656,29 +656,6 @@ static int ftdi_elan_release(struct inode *inode, struct file *file) ...@@ -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 * blocking bulk reads are used to get data from the device
...@@ -1222,7 +1199,6 @@ static ssize_t ftdi_elan_write(struct file *file, ...@@ -1222,7 +1199,6 @@ static ssize_t ftdi_elan_write(struct file *file,
static const struct file_operations ftdi_elan_fops = { static const struct file_operations ftdi_elan_fops = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.llseek = no_llseek, .llseek = no_llseek,
.ioctl = ftdi_elan_ioctl,
.read = ftdi_elan_read, .read = ftdi_elan_read,
.write = ftdi_elan_write, .write = ftdi_elan_write,
.open = ftdi_elan_open, .open = ftdi_elan_open,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment