From richard@audacityteam.org Tue Aug 18 10:38:35 2009 From: Richard Ash Date: Mon, 17 Aug 2009 10:39:58 +0100 Subject: Staging: quatech_usb2: TIOCMGET and TIOCMSET removal To: Greg KH Cc: Linux USB Message-ID: <1250501998.4534.12.camel@linux-dev> Patch to remove TIOCMGET and TIOCMSET from the driver ioctl method, as they never get used (error in vendor driver). Signed-off-by: Richard Ash Signed-off-by: Greg Kroah-Hartman --- drivers/staging/quatech_usb2/quatech_usb2.c | 32 ++++++++++++---------------- 1 file changed, 14 insertions(+), 18 deletions(-) --- a/drivers/staging/quatech_usb2/quatech_usb2.c +++ b/drivers/staging/quatech_usb2/quatech_usb2.c @@ -860,7 +860,10 @@ static int qt2_chars_in_buffer(struct tt return chars; } - +/* called when userspace does an ioctl() on the device. Note that + * TIOCMGET and TIOCMSET are filtered off to their own methods before they get + * here, so we don't have to handle them. + */ static int qt2_ioctl(struct tty_struct *tty, struct file *file, unsigned int cmd, unsigned long arg) { @@ -887,22 +890,12 @@ static int qt2_ioctl(struct tty_struct * dbg("%s(): port %d, UartNumber %d, tty =0x%p", __func__, port->number, UartNumber, tty); - if (cmd == TIOCMGET) { - return qt2_tiocmget(tty, file); - /* same as tiocmget function */ - } else if (cmd == TIOCMSET) { - if (copy_from_user(&value, (unsigned int *)arg, - sizeof(unsigned int))) - return -EFAULT; - return qt2_tiocmset(tty, file, value, 0); - /* same as tiocmset function */ - } else if (cmd == TIOCMBIS || cmd == TIOCMBIC) { - status = qt2_box_get_register(port->serial, UartNumber, - QT2_MODEM_CONTROL_REGISTER, &mcr_value); - if (status < 0) + if (cmd == TIOCMBIS || cmd == TIOCMBIC) { + if (qt2_box_get_register(port->serial, UartNumber, + QT2_MODEM_CONTROL_REGISTER, &mcr_value) < 0) return -ESPIPE; if (copy_from_user(&value, (unsigned int *)arg, - sizeof(unsigned int))) + sizeof(value))) return -EFAULT; switch (cmd) { @@ -925,9 +918,8 @@ static int qt2_ioctl(struct tty_struct * default: break; } /* end of local switch on cmd */ - status = qt2_box_set_register(port->serial, UartNumber, - QT2_MODEM_CONTROL_REGISTER, mcr_value); - if (status < 0) { + if (qt2_box_set_register(port->serial, UartNumber, + QT2_MODEM_CONTROL_REGISTER, mcr_value) < 0) { return -ESPIPE; } else { port_extra->shadowMCR = mcr_value; @@ -965,6 +957,10 @@ static int qt2_ioctl(struct tty_struct * return 0; } } /* end inifinite while */ + /* FIXME: This while loop needs a way to break out if the device + * is disconnected while a process is waiting for the MSR to + * change, because once it's disconnected, it isn't going to + * change state ... */ } else { /* any other ioctls we don't know about come here */ dbg("%s(): No ioctl for that one. port = %d", __func__,