Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 5bc9e5933a41888f9e0d77dedc9f8a972fa1f493

Authored by Peter Senna Tschudin
Committed by Johan Hovold
1 parent cca16d6242
Exists in ti-lsk-linux-4.1.y and in 10 other branches dlt-processor-sdk-linux-03.00.00.04, processor-sdk-linux-02.00.01, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04

USB: kl5kusb105: Remove klsi_105_tiocmset function 

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 <johan@kernel.org>

Showing 1 changed file with 0 additions and 30 deletions Side-by-side Diff

drivers/usb/serial/kl5kusb105.c
Diff comments   View file @ 5bc9e59
... ... @@ -62,8 +62,6 @@
62 62 static void klsi_105_set_termios(struct tty_struct *tty,
63 63 struct usb_serial_port *port, struct ktermios *old);
64 64 static int klsi_105_tiocmget(struct tty_struct *tty);
65   -static int klsi_105_tiocmset(struct tty_struct *tty,
66   - unsigned int set, unsigned int clear);
67 65 static void klsi_105_process_read_urb(struct urb *urb);
68 66 static int klsi_105_prepare_write_buffer(struct usb_serial_port *port,
69 67 void *dest, size_t size);
... ... @@ -93,7 +91,6 @@
93 91 .set_termios = klsi_105_set_termios,
94 92 /*.break_ctl = klsi_105_break_ctl,*/
95 93 .tiocmget = klsi_105_tiocmget,
96   - .tiocmset = klsi_105_tiocmset,
97 94 .port_probe = klsi_105_port_probe,
98 95 .port_remove = klsi_105_port_remove,
99 96 .throttle = usb_serial_generic_throttle,
... ... @@ -600,33 +597,6 @@
600 597 spin_unlock_irqrestore(&priv->lock, flags);
601 598 dev_dbg(&port->dev, "%s - read line state 0x%lx\n", __func__, line_state);
602 599 return (int)line_state;
603   -}
604   -
605   -static int klsi_105_tiocmset(struct tty_struct *tty,
606   - unsigned int set, unsigned int clear)
607   -{
608   - int retval = -EINVAL;
609   -
610   -/* if this ever gets implemented, it should be done something like this:
611   - struct usb_serial *serial = port->serial;
612   - struct klsi_105_private *priv = usb_get_serial_port_data(port);
613   - unsigned long flags;
614   - int control;
615   -
616   - spin_lock_irqsave (&priv->lock, flags);
617   - if (set & TIOCM_RTS)
618   - priv->control_state |= TIOCM_RTS;
619   - if (set & TIOCM_DTR)
620   - priv->control_state |= TIOCM_DTR;
621   - if (clear & TIOCM_RTS)
622   - priv->control_state &= ~TIOCM_RTS;
623   - if (clear & TIOCM_DTR)
624   - priv->control_state &= ~TIOCM_DTR;
625   - control = priv->control_state;
626   - spin_unlock_irqrestore (&priv->lock, flags);
627   - retval = mct_u232_set_modem_ctrl(serial, control);
628   -*/
629   - return retval;
630 600 }
631 601  
632 602 module_usb_serial_driver(serial_drivers, id_table);