* [PATCH 1/11 V2] USB: kl5kusb105: Remove klsi_105_tiocmset function
@ 2014-05-31 16:03 Peter Senna Tschudin
2014-06-01 9:31 ` Johan Hovold
0 siblings, 1 reply; 3+ messages in thread
From: Peter Senna Tschudin @ 2014-05-31 16:03 UTC (permalink / raw)
To: Oliver Neukum
Cc: kernel-janitors, Johan Hovold, Greg Kroah-Hartman, linux-usb,
linux-kernel
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>
---
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
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);
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 1/11 V2] USB: kl5kusb105: Remove klsi_105_tiocmset function
2014-05-31 16:03 [PATCH 1/11 V2] USB: kl5kusb105: Remove klsi_105_tiocmset function Peter Senna Tschudin
@ 2014-06-01 9:31 ` Johan Hovold
2014-07-07 8:53 ` Johan Hovold
0 siblings, 1 reply; 3+ messages in thread
From: Johan Hovold @ 2014-06-01 9:31 UTC (permalink / raw)
To: Peter Senna Tschudin, Greg Kroah-Hartman
Cc: Oliver Neukum, kernel-janitors, Johan Hovold, linux-usb,
linux-kernel
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@gmail.com>
Signed-off-by: Johan Hovold <jhovold@gmail.com>
> ---
> 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);
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH 1/11 V2] USB: kl5kusb105: Remove klsi_105_tiocmset function
2014-06-01 9:31 ` Johan Hovold
@ 2014-07-07 8:53 ` Johan Hovold
0 siblings, 0 replies; 3+ messages in thread
From: Johan Hovold @ 2014-07-07 8:53 UTC (permalink / raw)
To: Peter Senna Tschudin, Greg Kroah-Hartman
Cc: Oliver Neukum, kernel-janitors, Johan Hovold, linux-usb,
linux-kernel
On Sun, Jun 01, 2014 at 11:31:17AM +0200, Johan Hovold wrote:
> 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@gmail.com>
>
> Signed-off-by: Johan Hovold <jhovold@gmail.com>
It seems this one was never picked up, but I'm applying it to my tree
now.
Thanks again, Peter.
Johan
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-07-07 8:53 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-05-31 16:03 [PATCH 1/11 V2] USB: kl5kusb105: Remove klsi_105_tiocmset function Peter Senna Tschudin
2014-06-01 9:31 ` Johan Hovold
2014-07-07 8:53 ` Johan Hovold
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).