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

USB: image: mdc800: 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.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

+21 -24
+21 -24
drivers/usb/image/mdc800.c
··· 284 284 int data_received=0, wake_up; 285 285 unsigned char* b=urb->transfer_buffer; 286 286 struct mdc800_data* mdc800=urb->context; 287 + int status = urb->status; 287 288 288 - if (urb->status >= 0) 289 - { 289 + if (status >= 0) { 290 290 291 291 //dbg ("%i %i %i %i %i %i %i %i \n",b[0],b[1],b[2],b[3],b[4],b[5],b[6],b[7]); 292 292 ··· 324 324 || 325 325 ((mdc800->camera_request_ready == 3) && (mdc800->camera_busy)) 326 326 || 327 - (urb->status < 0) 327 + (status < 0) 328 328 ); 329 329 330 330 if (wake_up) ··· 376 376 static void mdc800_usb_write_notify (struct urb *urb) 377 377 { 378 378 struct mdc800_data* mdc800=urb->context; 379 + int status = urb->status; 379 380 380 - if (urb->status != 0) 381 - { 382 - err ("writing command fails (status=%i)", urb->status); 383 - } 381 + if (status != 0) 382 + err ("writing command fails (status=%i)", status); 384 383 else 385 - { 386 384 mdc800->state=READY; 387 - } 388 385 mdc800->written = 1; 389 386 wake_up (&mdc800->write_wait); 390 387 } ··· 393 396 static void mdc800_usb_download_notify (struct urb *urb) 394 397 { 395 398 struct mdc800_data* mdc800=urb->context; 399 + int status = urb->status; 396 400 397 - if (urb->status == 0) 398 - { 401 + if (status == 0) { 399 402 /* Fill output buffer with these data */ 400 403 memcpy (mdc800->out, urb->transfer_buffer, 64); 401 404 mdc800->out_count=64; ··· 405 408 { 406 409 mdc800->state=READY; 407 410 } 408 - } 409 - else 410 - { 411 - err ("request bytes fails (status:%i)", urb->status); 411 + } else { 412 + err ("request bytes fails (status:%i)", status); 412 413 } 413 414 mdc800->downloaded = 1; 414 415 wake_up (&mdc800->download_wait); ··· 644 649 645 650 retval=0; 646 651 mdc800->irq_urb->dev = mdc800->dev; 647 - if (usb_submit_urb (mdc800->irq_urb, GFP_KERNEL)) 648 - { 649 - err ("request USB irq fails (submit_retval=%i urb_status=%i).",retval, mdc800->irq_urb->status); 652 + retval = usb_submit_urb (mdc800->irq_urb, GFP_KERNEL); 653 + if (retval) { 654 + err ("request USB irq fails (submit_retval=%i).", retval); 650 655 errn = -EIO; 651 656 goto error_out; 652 657 } ··· 693 698 { 694 699 size_t left=len, sts=len; /* single transfer size */ 695 700 char __user *ptr = buf; 701 + int retval; 696 702 697 703 mutex_lock(&mdc800->io_lock); 698 704 if (mdc800->state == NOT_CONNECTED) ··· 733 737 734 738 /* Download -> Request new bytes */ 735 739 mdc800->download_urb->dev = mdc800->dev; 736 - if (usb_submit_urb (mdc800->download_urb, GFP_KERNEL)) 737 - { 738 - err ("Can't submit download urb (status=%i)",mdc800->download_urb->status); 740 + retval = usb_submit_urb (mdc800->download_urb, GFP_KERNEL); 741 + if (retval) { 742 + err ("Can't submit download urb (retval=%i)",retval); 739 743 mutex_unlock(&mdc800->io_lock); 740 744 return len-left; 741 745 } ··· 784 788 static ssize_t mdc800_device_write (struct file *file, const char __user *buf, size_t len, loff_t *pos) 785 789 { 786 790 size_t i=0; 791 + int retval; 787 792 788 793 mutex_lock(&mdc800->io_lock); 789 794 if (mdc800->state != READY) ··· 851 854 mdc800->state=WORKING; 852 855 memcpy (mdc800->write_urb->transfer_buffer, mdc800->in,8); 853 856 mdc800->write_urb->dev = mdc800->dev; 854 - if (usb_submit_urb (mdc800->write_urb, GFP_KERNEL)) 855 - { 856 - err ("submitting write urb fails (status=%i)", mdc800->write_urb->status); 857 + retval = usb_submit_urb (mdc800->write_urb, GFP_KERNEL); 858 + if (retval) { 859 + err ("submitting write urb fails (retval=%i)", retval); 857 860 mutex_unlock(&mdc800->io_lock); 858 861 return -EIO; 859 862 }