Skip to content

Commit

Permalink
USB: ftdi_usb: Eliminate ioctl and BKL ioctl use
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Alan Cox authored and Greg Kroah-Hartman committed Jul 21, 2008
1 parent 44c389a commit 1160d07
Showing 1 changed file with 0 additions and 24 deletions.
24 changes: 0 additions & 24 deletions drivers/usb/misc/ftdi-elan.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -1222,7 +1199,6 @@ static ssize_t ftdi_elan_write(struct file *file,
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,
Expand Down

0 comments on commit 1160d07

Please sign in to comment.