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: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/usb/serial/ir-usb.c b/drivers/usb/serial/ir-usb.c
index 9d847f69291cacb69aac6816cca2c24a2078e4c0..8cec5e520d95d12c460f531b749d1dad226d2c40 100644 (file)
--- a/drivers/usb/serial/ir-usb.c
+++ b/drivers/usb/serial/ir-usb.c
@@ -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)
 {
        struct usb_serial_port *port = (struct usb_serial_port *)urb->context;
+       int status = urb->status;
 
        dbg("%s - port %d", __FUNCTION__, port->number);
 
        port->write_urb_busy = 0;
-       if (urb->status) {
-               dbg("%s - nonzero write bulk status received: %d", __FUNCTION__, urb->status);
+       if (status) {
+               dbg("%s - nonzero write bulk status received: %d",
+                   __FUNCTION__, status);
                return;
        }
 
@@ -417,6 +419,7 @@ static void ir_read_bulk_callback (struct urb *urb)
        struct tty_struct *tty;
        unsigned char *data = urb->transfer_buffer;
        int result;
+       int status = urb->status;
 
        dbg("%s - port %d", __FUNCTION__, port->number);
 
@@ -425,8 +428,7 @@ static void ir_read_bulk_callback (struct urb *urb)
                return;
        }
 
-       switch (urb->status) {
-
+       switch (status) {
                case 0: /* Successful */
 
                        /*
@@ -490,7 +492,7 @@ static void ir_read_bulk_callback (struct urb *urb)
                default:
                        dbg("%s - nonzero read bulk status received: %d",
                                __FUNCTION__, 
-                               urb->status);
+                               status);
                        break ;
 
        }