UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

USB: serial: kl5kusb105: simplify line-status handling 

Now that the driver is using usb_control_msg_recv(), the line status
handling can be simplified further by reading directly into the status
variable and doing the endian conversion in place.

Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Johan Hovold <johan@kernel.org>
This commit is contained in:
Johan Hovold 2021-09-21 15:30:08 +02:00
parent a692d0e606
commit 2e0b78dad3
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/usb/serial/kl5kusb105.c
View File

@ -163,21 +163,18 @@ static unsigned long klsi_105_status2linestate(const __u16 status)
* Read line control via vendor command and return result through * Read line control via vendor command and return result through
* *line_state_p * *line_state_p
*/ */
/* It seems that the status buffer has always only 2 bytes length */
#define KLSI_STATUSBUF_LEN 2
static int klsi_105_get_line_state(struct usb_serial_port *port, static int klsi_105_get_line_state(struct usb_serial_port *port,
unsigned long *line_state_p) unsigned long *line_state_p)
{ {
u16 status;
int rc; int rc;
u8 status_buf[KLSI_STATUSBUF_LEN];
__u16 status;
rc = usb_control_msg_recv(port->serial->dev, 0, rc = usb_control_msg_recv(port->serial->dev, 0,
KL5KUSB105A_SIO_POLL, KL5KUSB105A_SIO_POLL,
USB_TYPE_VENDOR | USB_DIR_IN, USB_TYPE_VENDOR | USB_DIR_IN,
0, /* value */ 0, /* value */
0, /* index */ 0, /* index */
status_buf, KLSI_STATUSBUF_LEN, &status, sizeof(status),
10000, 10000,
GFP_KERNEL); GFP_KERNEL);
if (rc) { if (rc) {
@ -185,10 +182,9 @@ static int klsi_105_get_line_state(struct usb_serial_port *port,
return rc; return rc;
} }
status = get_unaligned_le16(status_buf); le16_to_cpus(&status);
dev_dbg(&port->dev, "read status %02x %02x\n", dev_dbg(&port->dev, "read status %04x\n", status);
status_buf[0], status_buf[1]);
*line_state_p = klsi_105_status2linestate(status); *line_state_p = klsi_105_status2linestate(status);