diff options
| author | Johan Hovold <jhovold@gmail.com> | 2014-01-02 22:49:33 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-01-03 12:42:24 -0800 |
| commit | 271ec2d2d7bd4ab528a7a94701503df06ca8fd52 (patch) | |
| tree | 4e7ced5a15530fc74bfa0f0e389556bd757a69ea | |
| parent | 5e409a265d9327689eef15a8fff1ffcb7f8fc2e1 (diff) | |
| download | linux-stable-271ec2d2d7bd4ab528a7a94701503df06ca8fd52.tar.gz linux-stable-271ec2d2d7bd4ab528a7a94701503df06ca8fd52.tar.bz2 linux-stable-271ec2d2d7bd4ab528a7a94701503df06ca8fd52.zip | |
USB: ch341: clean up interrupt handler
Clean up interrupt completion handler somewhat.
Signed-off-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/usb/serial/ch341.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/drivers/usb/serial/ch341.c b/drivers/usb/serial/ch341.c index ac21618ace19..65a81c64bf7b 100644 --- a/drivers/usb/serial/ch341.c +++ b/drivers/usb/serial/ch341.c @@ -484,9 +484,9 @@ static void ch341_update_line_status(struct usb_serial_port *port, static void ch341_read_int_callback(struct urb *urb) { - struct usb_serial_port *port = (struct usb_serial_port *) urb->context; + struct usb_serial_port *port = urb->context; unsigned char *data = urb->transfer_buffer; - unsigned int actual_length = urb->actual_length; + unsigned int len = urb->actual_length; int status; switch (urb->status) { @@ -497,24 +497,23 @@ static void ch341_read_int_callback(struct urb *urb) case -ENOENT: case -ESHUTDOWN: /* this urb is terminated, clean up */ - dev_dbg(&urb->dev->dev, "%s - urb shutting down with status: %d\n", + dev_dbg(&urb->dev->dev, "%s - urb shutting down: %d\n", __func__, urb->status); return; default: - dev_dbg(&urb->dev->dev, "%s - nonzero urb status received: %d\n", + dev_dbg(&urb->dev->dev, "%s - nonzero urb status: %d\n", __func__, urb->status); goto exit; } - usb_serial_debug_data(&port->dev, __func__, - urb->actual_length, urb->transfer_buffer); - ch341_update_line_status(port, data, actual_length); + usb_serial_debug_data(&port->dev, __func__, len, data); + ch341_update_line_status(port, data, len); exit: status = usb_submit_urb(urb, GFP_ATOMIC); - if (status) - dev_err(&urb->dev->dev, - "%s - usb_submit_urb failed with result %d\n", + if (status) { + dev_err(&urb->dev->dev, "%s - usb_submit_urb failed: %d\n", __func__, status); + } } static int ch341_tiocmget(struct tty_struct *tty) |