lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Tue, 21 Sep 2021 15:30:09 +0200 From: Johan Hovold <johan@...nel.org> To: Johan Hovold <johan@...nel.org> Cc: Himadri Pandya <himadrispandya@...il.com>, linux-usb@...r.kernel.org, linux-kernel@...r.kernel.org Subject: [PATCH 3/3] USB: serial: kl5kusb105: drop line-status helper Drop the line-status conversion helper and do the conversion in place instead. Signed-off-by: Johan Hovold <johan@...nel.org> --- drivers/usb/serial/kl5kusb105.c | 19 ++++--------------- 1 file 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; } -- 2.32.0
Powered by blists - more mailing lists