Commit 3152b74f authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

USB: serial: ir-usb: clean up urb->status usage

This done in anticipation of removal of urb->status, which will make
that patch easier to review and apply in the future.


Cc: <linux-usb-devel@lists.sourceforge.net>
Cc: Gary Brubaker <xavyer@ix.netcom.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent b4a15797
...@@ -392,12 +392,14 @@ static int ir_write (struct usb_serial_port *port, const unsigned char *buf, int ...@@ -392,12 +392,14 @@ static int ir_write (struct usb_serial_port *port, const unsigned char *buf, int
static void ir_write_bulk_callback (struct urb *urb) static void ir_write_bulk_callback (struct urb *urb)
{ {
struct usb_serial_port *port = (struct usb_serial_port *)urb->context; struct usb_serial_port *port = (struct usb_serial_port *)urb->context;
int status = urb->status;
dbg("%s - port %d", __FUNCTION__, port->number); dbg("%s - port %d", __FUNCTION__, port->number);
port->write_urb_busy = 0; port->write_urb_busy = 0;
if (urb->status) { if (status) {
dbg("%s - nonzero write bulk status received: %d", __FUNCTION__, urb->status); dbg("%s - nonzero write bulk status received: %d",
__FUNCTION__, status);
return; return;
} }
...@@ -417,6 +419,7 @@ static void ir_read_bulk_callback (struct urb *urb) ...@@ -417,6 +419,7 @@ static void ir_read_bulk_callback (struct urb *urb)
struct tty_struct *tty; struct tty_struct *tty;
unsigned char *data = urb->transfer_buffer; unsigned char *data = urb->transfer_buffer;
int result; int result;
int status = urb->status;
dbg("%s - port %d", __FUNCTION__, port->number); dbg("%s - port %d", __FUNCTION__, port->number);
...@@ -425,8 +428,7 @@ static void ir_read_bulk_callback (struct urb *urb) ...@@ -425,8 +428,7 @@ static void ir_read_bulk_callback (struct urb *urb)
return; return;
} }
switch (urb->status) { switch (status) {
case 0: /* Successful */ case 0: /* Successful */
/* /*
...@@ -490,7 +492,7 @@ static void ir_read_bulk_callback (struct urb *urb) ...@@ -490,7 +492,7 @@ static void ir_read_bulk_callback (struct urb *urb)
default: default:
dbg("%s - nonzero read bulk status received: %d", dbg("%s - nonzero read bulk status received: %d",
__FUNCTION__, __FUNCTION__,
urb->status); status);
break ; break ;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment