On Sat, May 31, 2014 at 01:03:00PM -0300, Peter Senna Tschudin wrote:
> 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@xxxxxxxxx>
Signed-off-by: Johan Hovold <jhovold@xxxxxxxxx>
> ---
> Changes from V1:
> - remove the function klsi_105_tiocmset instead of simplifying it
> - remove the function prototype
> - remove the .tiocmset entry in the struct usb_serial_driver
> - update commit message and subject
Thanks for the update, Peter.
Johan
>
> drivers/usb/serial/kl5kusb105.c | 23 +----------------------
> 1 file changed, 1 insertion(+), 22 deletions(-)
>
> diff --git a/drivers/usb/serial/kl5kusb105.c b/drivers/usb/serial/kl5kusb105.c
> index d7440b7..e020ad2 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);
> 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);
--
To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
