diff options
| author | Peter Senna Tschudin <peter.senna@gmail.com> | 2014-05-31 12:03:00 -0400 |
|---|---|---|
| committer | Johan Hovold <johan@kernel.org> | 2014-07-07 04:49:28 -0400 |
| commit | 5bc9e5933a41888f9e0d77dedc9f8a972fa1f493 (patch) | |
| tree | 23224e6c96d66adec42f41274ef9494c4375e26f | |
| parent | cca16d62426680b49dd3b6008d10f50156874080 (diff) | |
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>
| -rw-r--r-- | drivers/usb/serial/kl5kusb105.c | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/drivers/usb/serial/kl5kusb105.c b/drivers/usb/serial/kl5kusb105.c index d7440b7557af..e020ad28a00c 100644 --- a/drivers/usb/serial/kl5kusb105.c +++ b/drivers/usb/serial/kl5kusb105.c | |||
| @@ -62,8 +62,6 @@ static void klsi_105_close(struct usb_serial_port *port); | |||
| 62 | static void klsi_105_set_termios(struct tty_struct *tty, | 62 | static void klsi_105_set_termios(struct tty_struct *tty, |
| 63 | struct usb_serial_port *port, struct ktermios *old); | 63 | struct usb_serial_port *port, struct ktermios *old); |
| 64 | static int klsi_105_tiocmget(struct tty_struct *tty); | 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 | static void klsi_105_process_read_urb(struct urb *urb); | 65 | static void klsi_105_process_read_urb(struct urb *urb); |
| 68 | static int klsi_105_prepare_write_buffer(struct usb_serial_port *port, | 66 | static int klsi_105_prepare_write_buffer(struct usb_serial_port *port, |
| 69 | void *dest, size_t size); | 67 | void *dest, size_t size); |
| @@ -93,7 +91,6 @@ static struct usb_serial_driver kl5kusb105d_device = { | |||
| 93 | .set_termios = klsi_105_set_termios, | 91 | .set_termios = klsi_105_set_termios, |
| 94 | /*.break_ctl = klsi_105_break_ctl,*/ | 92 | /*.break_ctl = klsi_105_break_ctl,*/ |
| 95 | .tiocmget = klsi_105_tiocmget, | 93 | .tiocmget = klsi_105_tiocmget, |
| 96 | .tiocmset = klsi_105_tiocmset, | ||
| 97 | .port_probe = klsi_105_port_probe, | 94 | .port_probe = klsi_105_port_probe, |
| 98 | .port_remove = klsi_105_port_remove, | 95 | .port_remove = klsi_105_port_remove, |
| 99 | .throttle = usb_serial_generic_throttle, | 96 | .throttle = usb_serial_generic_throttle, |
| @@ -602,33 +599,6 @@ static int klsi_105_tiocmget(struct tty_struct *tty) | |||
| 602 | return (int)line_state; | 599 | return (int)line_state; |
| 603 | } | 600 | } |
| 604 | 601 | ||
| 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 | } | ||
| 631 | |||
| 632 | module_usb_serial_driver(serial_drivers, id_table); | 602 | module_usb_serial_driver(serial_drivers, id_table); |
| 633 | 603 | ||
| 634 | MODULE_AUTHOR(DRIVER_AUTHOR); | 604 | MODULE_AUTHOR(DRIVER_AUTHOR); |
