USB: kl5kusb105: Remove klsi_105_tiocmset function
authorPeter Senna Tschudin <peter.senna@gmail.com>
Sat, 31 May 2014 16:03:00 +0000 (13:03 -0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 9 Jul 2014 22:44:06 +0000 (15:44 -0700)
This patch remove the function klsi_105_tiocmset which was only
returning -EINVAL. It also removes the function prototype and
the .tiocmset entry in the struct usb_serial_driver.

Verified by compilation only.

Signed-off-by: Peter Senna Tschudin <peter.senna@gmail.com>
Signed-off-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/serial/kl5kusb105.c

index d7440b7557afde7a643dbf76f8e22eae517bf435..e020ad28a00c9d566d24143175cb50baf1e07a90 100644 (file)
@@ -62,8 +62,6 @@ static void klsi_105_close(struct usb_serial_port *port);
 static void klsi_105_set_termios(struct tty_struct *tty,
                        struct usb_serial_port *port, struct ktermios *old);
 static int  klsi_105_tiocmget(struct tty_struct *tty);
-static int  klsi_105_tiocmset(struct tty_struct *tty,
-                       unsigned int set, unsigned int clear);
 static void klsi_105_process_read_urb(struct urb *urb);
 static int klsi_105_prepare_write_buffer(struct usb_serial_port *port,
                                                void *dest, size_t size);
@@ -93,7 +91,6 @@ static struct usb_serial_driver kl5kusb105d_device = {
        .set_termios =          klsi_105_set_termios,
        /*.break_ctl =          klsi_105_break_ctl,*/
        .tiocmget =             klsi_105_tiocmget,
-       .tiocmset =             klsi_105_tiocmset,
        .port_probe =           klsi_105_port_probe,
        .port_remove =          klsi_105_port_remove,
        .throttle =             usb_serial_generic_throttle,
@@ -602,33 +599,6 @@ static int klsi_105_tiocmget(struct tty_struct *tty)
        return (int)line_state;
 }
 
-static int klsi_105_tiocmset(struct tty_struct *tty,
-                            unsigned int set, unsigned int clear)
-{
-       int retval = -EINVAL;
-
-/* if this ever gets implemented, it should be done something like this:
-       struct usb_serial *serial = port->serial;
-       struct klsi_105_private *priv = usb_get_serial_port_data(port);
-       unsigned long flags;
-       int control;
-
-       spin_lock_irqsave (&priv->lock, flags);
-       if (set & TIOCM_RTS)
-               priv->control_state |= TIOCM_RTS;
-       if (set & TIOCM_DTR)
-               priv->control_state |= TIOCM_DTR;
-       if (clear & TIOCM_RTS)
-               priv->control_state &= ~TIOCM_RTS;
-       if (clear & TIOCM_DTR)
-               priv->control_state &= ~TIOCM_DTR;
-       control = priv->control_state;
-       spin_unlock_irqrestore (&priv->lock, flags);
-       retval = mct_u232_set_modem_ctrl(serial, control);
-*/
-       return retval;
-}
-
 module_usb_serial_driver(serial_drivers, id_table);
 
 MODULE_AUTHOR(DRIVER_AUTHOR);