mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-05 08:26:59 +00:00
Code Issues Releases Wiki Activity

USB: serial: kl5kusb105: simplify line-status handling

Browse source 
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
* *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,
unsigned long *line_state_p)
{
u16 status;
int rc;
u8 status_buf[KLSI_STATUSBUF_LEN];
__u16 status;
rc = usb_control_msg_recv(port->serial->dev, 0,
KL5KUSB105A_SIO_POLL,
USB_TYPE_VENDOR | USB_DIR_IN,
0, /* value */
0, /* index */
status_buf, KLSI_STATUSBUF_LEN,
&status, sizeof(status),
10000,
GFP_KERNEL);
if (rc) {
@ -185,10 +182,9 @@ static int klsi_105_get_line_state(struct usb_serial_port *port,
return rc;
}
status = get_unaligned_le16(status_buf);
le16_to_cpus(&status);
dev_dbg(&port->dev, "read status %02x %02x\n",
status_buf[0], status_buf[1]);
dev_dbg(&port->dev, "read status %04x\n", status);
*line_state_p = klsi_105_status2linestate(status);