Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

USB: serial: aircable: 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>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

+9 -7
+9 -7
drivers/usb/serial/aircable.c
··· 411 411 static void aircable_write_bulk_callback(struct urb *urb) 412 412 { 413 413 struct usb_serial_port *port = urb->context; 414 + int status = urb->status; 414 415 int result; 415 416 416 - dbg("%s - urb->status: %d", __FUNCTION__ , urb->status); 417 + dbg("%s - urb status: %d", __FUNCTION__ , status); 417 418 418 419 /* This has been taken from cypress_m8.c cypress_write_int_callback */ 419 - switch (urb->status) { 420 + switch (status) { 420 421 case 0: 421 422 /* success */ 422 423 break; ··· 426 425 case -ESHUTDOWN: 427 426 /* this urb is terminated, clean up */ 428 427 dbg("%s - urb shutting down with status: %d", 429 - __FUNCTION__, urb->status); 428 + __FUNCTION__, status); 430 429 port->write_urb_busy = 0; 431 430 return; 432 431 default: 433 432 /* error in the urb, so we have to resubmit it */ 434 433 dbg("%s - Overflow in write", __FUNCTION__); 435 434 dbg("%s - nonzero write bulk status received: %d", 436 - __FUNCTION__, urb->status); 435 + __FUNCTION__, status); 437 436 port->write_urb->transfer_buffer_length = 1; 438 437 port->write_urb->dev = port->serial->dev; 439 438 result = usb_submit_urb(port->write_urb, GFP_ATOMIC); ··· 458 457 unsigned long no_packages, remaining, package_length, i; 459 458 int result, shift = 0; 460 459 unsigned char *temp; 460 + int status = urb->status; 461 461 462 462 dbg("%s - port %d", __FUNCTION__, port->number); 463 463 464 - if (urb->status) { 465 - dbg("%s - urb->status = %d", __FUNCTION__, urb->status); 464 + if (status) { 465 + dbg("%s - urb status = %d", __FUNCTION__, status); 466 466 if (!port->open_count) { 467 467 dbg("%s - port is closed, exiting.", __FUNCTION__); 468 468 return; 469 469 } 470 - if (urb->status == -EPROTO) { 470 + if (status == -EPROTO) { 471 471 dbg("%s - caught -EPROTO, resubmitting the urb", 472 472 __FUNCTION__); 473 473 usb_fill_bulk_urb(port->read_urb, port->serial->dev,