diff options
| author |   Johan Hovold <johan@kernel.org> | 2021-09-21 15:30:09 +0200 |
|---|---|---|
| committer | Johan Hovold <johan@kernel.org> | 2021-09-22 09:33:17 +0200 |
| commit | c8345c0500de4411762db5941058e34979879128 (patch) | |
| tree | af0d5ffa5f8092743846d1f68c2ca673ea32b3db /drivers/usb/serial | |
| parent | USB: serial: kl5kusb105: simplify line-status handling (diff) | |
| download | wireguard-linux-c8345c0500de4411762db5941058e34979879128.tar.xz wireguard-linux-c8345c0500de4411762db5941058e34979879128.zip | |
USB: serial: kl5kusb105: drop line-status helper
Drop the line-status conversion helper and do the conversion in place
instead.
Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Johan Hovold <johan@kernel.org>
Diffstat (limited to 'drivers/usb/serial')
| -rw-r--r-- | drivers/usb/serial/kl5kusb105.c | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/drivers/usb/serial/kl5kusb105.c b/drivers/usb/serial/kl5kusb105.c index 99dffbdd3142..edcc57bd9b5e 100644 --- a/drivers/usb/serial/kl5kusb105.c +++ b/drivers/usb/serial/kl5kusb105.c @@ -147,24 +147,12 @@ static int klsi_105_chg_port_settings(struct usb_serial_port *port, return rc; } -/* translate a 16-bit status value from the device to linux's TIO bits */ -static unsigned long klsi_105_status2linestate(const __u16 status) -{ - unsigned long res = 0; - - res = ((status & KL5KUSB105A_DSR) ? TIOCM_DSR : 0) - | ((status & KL5KUSB105A_CTS) ? TIOCM_CTS : 0) - ; - - return res; -} - /* * Read line control via vendor command and return result through - * *line_state_p + * the state pointer. */ static int klsi_105_get_line_state(struct usb_serial_port *port, - unsigned long *line_state_p) + unsigned long *state) { u16 status; int rc; @@ -186,7 +174,8 @@ static int klsi_105_get_line_state(struct usb_serial_port *port, dev_dbg(&port->dev, "read status %04x\n", status); - *line_state_p = klsi_105_status2linestate(status); + *state = ((status & KL5KUSB105A_DSR) ? TIOCM_DSR : 0) | + ((status & KL5KUSB105A_CTS) ? TIOCM_CTS : 0); return 0; } |