aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMalcolm Priestley <tvboxspy@gmail.com>2014-02-27 18:06:15 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-02-27 20:09:19 -0500
commitd1b2a11d7ad1e0f915213cad1fe78f22a285dc63 (patch)
tree6d622bd92c51bf38204ead54461d2998802d7e64
parentd597aaef2d09880afea29904a3b524f6a6d3c7ce (diff)
staging: vt6656: s_nsBulkOutIoCompleteWrite Remove variable status.
Remove status and move debug messages to switch statement. Remove duplicate second debug message. Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/vt6656/usbpipe.c24
1 files changed, 5 insertions, 19 deletions
diff --git a/drivers/staging/vt6656/usbpipe.c b/drivers/staging/vt6656/usbpipe.c
index 57efb7f3587d..a4a4bf24aad6 100644
--- a/drivers/staging/vt6656/usbpipe.c
+++ b/drivers/staging/vt6656/usbpipe.c
@@ -584,38 +584,29 @@ static void s_nsBulkOutIoCompleteWrite(struct urb *urb)
584 struct vnt_usb_send_context *context = urb->context; 584 struct vnt_usb_send_context *context = urb->context;
585 struct vnt_private *priv = context->pDevice; 585 struct vnt_private *priv = context->pDevice;
586 u8 context_type = context->type; 586 u8 context_type = context->type;
587 int status;
588 587
589 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"---->s_nsBulkOutIoCompleteWrite\n"); 588 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"---->s_nsBulkOutIoCompleteWrite\n");
590 589
591 switch (urb->status) { 590 switch (urb->status) {
592 case 0: 591 case 0:
593 case -ETIMEDOUT: 592 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO
593 "Write %d bytes\n", context->uBufLen);
594 break; 594 break;
595 case -ECONNRESET: 595 case -ECONNRESET:
596 case -ENOENT: 596 case -ENOENT:
597 case -ESHUTDOWN: 597 case -ESHUTDOWN:
598 context->bBoolInUse = false; 598 context->bBoolInUse = false;
599 return; 599 return;
600 case -ETIMEDOUT:
600 default: 601 default:
602 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO
603 "BULK Out failed %d\n", urb->status);
601 break; 604 break;
602 } 605 }
603 606
604 if (!netif_device_present(priv->dev)) 607 if (!netif_device_present(priv->dev))
605 return; 608 return;
606 609
607
608 status = urb->status;
609
610 if (status == STATUS_SUCCESS) {
611 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO
612 "Write %d bytes\n", context->uBufLen);
613 } else {
614 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO
615 "BULK Out failed %d\n", status);
616 }
617
618
619 if (CONTEXT_DATA_PACKET == context_type) { 610 if (CONTEXT_DATA_PACKET == context_type) {
620 if (context->pPacket != NULL) { 611 if (context->pPacket != NULL) {
621 dev_kfree_skb_irq(context->pPacket); 612 dev_kfree_skb_irq(context->pPacket);
@@ -625,11 +616,6 @@ static void s_nsBulkOutIoCompleteWrite(struct urb *urb)
625 } 616 }
626 617
627 priv->dev->trans_start = jiffies; 618 priv->dev->trans_start = jiffies;
628
629 if (status != STATUS_SUCCESS) {
630 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO
631 "Send USB error! [%08xh]\n", status);
632 }
633 } 619 }
634 620
635 if (priv->bLinkPass == true) { 621 if (priv->bLinkPass == true) {