From 9aff38eeb58f026e2447bac223d7f6c0fb8c8fc1 Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Thu, 22 May 2008 22:04:48 +0100 Subject: [PATCH] --- yaml --- r: 104574 b: refs/heads/master c: 1160d0765660e14b44dffd931b28a3875d5d9e46 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/usb/misc/ftdi-elan.c | 24 ------------------------ 2 files changed, 1 insertion(+), 25 deletions(-) diff --git a/[refs] b/[refs] index 1baaaf05252d..f8069d4be1d5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 44c389a00ff7229ab2f2aab22ce03ae0c9037df7 +refs/heads/master: 1160d0765660e14b44dffd931b28a3875d5d9e46 diff --git a/trunk/drivers/usb/misc/ftdi-elan.c b/trunk/drivers/usb/misc/ftdi-elan.c index ec88b3bfee46..97c280971532 100644 --- a/trunk/drivers/usb/misc/ftdi-elan.c +++ b/trunk/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 @@ 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,