From db1eb913aac8f6487f14ab6b2c91cc8d80608d0a Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Wed, 26 Sep 2007 23:22:36 +0100 Subject: [PATCH] --- yaml --- r: 67919 b: refs/heads/master c: f621b8437d6ae502dde45797f56407e48c7a68b4 h: refs/heads/master i: 67917: 9b7943987e885d50f0e4065be77317575027fb3c 67915: 9596f4ee6e6a59897160bf22339c8110bd12dd9b 67911: f30e0f8d19604b75ceaf6b4b220d13a768019551 67903: 077b1102aecafa4651f6bbd253fe8c54a23852d6 v: v3 --- [refs] | 2 +- trunk/drivers/usb/serial/funsoft.c | 21 --------------------- 2 files changed, 1 insertion(+), 22 deletions(-) diff --git a/[refs] b/[refs] index c98b347fe896..e6f2a35a1f56 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d9c563626d9a136636385209d59d0c4f16c4a7ab +refs/heads/master: f621b8437d6ae502dde45797f56407e48c7a68b4 diff --git a/trunk/drivers/usb/serial/funsoft.c b/trunk/drivers/usb/serial/funsoft.c index 4092f6dc9efd..b5194dc7d3bb 100644 --- a/trunk/drivers/usb/serial/funsoft.c +++ b/trunk/drivers/usb/serial/funsoft.c @@ -24,26 +24,6 @@ static struct usb_device_id id_table [] = { }; MODULE_DEVICE_TABLE(usb, id_table); -static int funsoft_ioctl(struct usb_serial_port *port, struct file *file, - unsigned int cmd, unsigned long arg) -{ - struct ktermios t; - - dbg("%s - port %d, cmd 0x%04x", __FUNCTION__, port->number, cmd); - - if (cmd == TCSETSF) { - if (user_termios_to_kernel_termios(&t, (struct termios __user *)arg)) - return -EFAULT; - - dbg("%s - iflag:%x oflag:%x cflag:%x lflag:%x", __FUNCTION__, - t.c_iflag, t.c_oflag, t.c_cflag, t.c_lflag); - - if (!(t.c_lflag & ICANON)) - return -EINVAL; - } - return -ENOIOCTLCMD; -} - static struct usb_driver funsoft_driver = { .name = "funsoft", .probe = usb_serial_probe, @@ -63,7 +43,6 @@ static struct usb_serial_driver funsoft_device = { .num_bulk_in = NUM_DONT_CARE, .num_bulk_out = NUM_DONT_CARE, .num_ports = 1, - .ioctl = funsoft_ioctl, }; static int __init funsoft_init(void)