staging: vt6656: clean up s_nsBulkOutIoCompleteWrite.

Remove commented out, white space and camel case.

Camel case changes
pContext -> context
pDevice -> priv
ContextType -> context_type
ulBufLen -> buf_len

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/vt6656/usbpipe.c b/drivers/staging/vt6656/usbpipe.c
index 61d8220212092534a38c71a69a4d819c705a62f4..0ae5d20f3f342d62d74da857f1bc0c1cf4095ce4 100644 (file)
--- a/drivers/staging/vt6656/usbpipe.c
+++ b/drivers/staging/vt6656/usbpipe.c
@@ -607,14 +607,14 @@ int PIPEnsSendBulkOut(struct vnt_private *pDevice,
 
 static void s_nsBulkOutIoCompleteWrite(struct urb *urb)
 {
-       struct vnt_usb_send_context *pContext =
+       struct vnt_usb_send_context *context =
                        (struct vnt_usb_send_context *)urb->context;
-       struct vnt_private *pDevice = pContext->pDevice;
-       CONTEXT_TYPE ContextType = pContext->Type;
-       unsigned long ulBufLen = pContext->uBufLen;
+       struct vnt_private *priv = context->pDevice;
+       CONTEXT_TYPE context_type = context->Type;
+       unsigned long buf_len = context->uBufLen;
        int status;
 
-    DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"---->s_nsBulkOutIoCompleteWrite\n");
+       DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"---->s_nsBulkOutIoCompleteWrite\n");
 
        switch (urb->status) {
        case 0:
@@ -623,58 +623,56 @@ static void s_nsBulkOutIoCompleteWrite(struct urb *urb)
        case -ECONNRESET:
        case -ENOENT:
        case -ESHUTDOWN:
-               pContext->bBoolInUse = false;
+               context->bBoolInUse = false;
                return;
        default:
                break;
        }
 
-    if (!netif_device_present(pDevice->dev))
-           return;
+       if (!netif_device_present(priv->dev))
+               return;
 
-   //
-    // Perform various IRP, URB, and buffer 'sanity checks'
-    //
 
-    status = urb->status;
+       status = urb->status;
 
-    if(status == STATUS_SUCCESS) {
-        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Write %d bytes\n",(int)ulBufLen);
-        pDevice->ulBulkOutBytesWrite += ulBufLen;
-        pDevice->ulBulkOutContCRCError = 0;
-    } else {
-        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"BULK Out failed %d\n", status);
-        pDevice->ulBulkOutError++;
-    }
+       if (status == STATUS_SUCCESS) {
+               DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO
+                       "Write %d bytes\n", (int)buf_len);
+               priv->ulBulkOutBytesWrite += buf_len;
+               priv->ulBulkOutContCRCError = 0;
+       } else {
+               DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO
+                               "BULK Out failed %d\n", status);
+               priv->ulBulkOutError++;
+       }
 
-//    pDevice->ulCheckForHangCount = 0;
-//    pDevice->pPendingBulkOutContext = NULL;
 
-    if ( CONTEXT_DATA_PACKET == ContextType ) {
-        // Indicate to the protocol the status of the sent packet and return
-        // ownership of the packet.
-           if (pContext->pPacket != NULL) {
-               dev_kfree_skb_irq(pContext->pPacket);
-               pContext->pPacket = NULL;
-            DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"tx  %d bytes\n",(int)ulBufLen);
-           }
+       if (CONTEXT_DATA_PACKET == context_type) {
+               if (context->pPacket != NULL) {
+                       dev_kfree_skb_irq(context->pPacket);
+                       context->pPacket = NULL;
+                       DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO
+                               "tx  %d bytes\n", (int)buf_len);
+               }
 
-        pDevice->dev->trans_start = jiffies;
+               priv->dev->trans_start = jiffies;
 
-        if (status == STATUS_SUCCESS) {
-            pDevice->packetsSent++;
-        }
-        else {
-            DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Send USB error! [%08xh]\n", status);
-            pDevice->packetsSentDropped++;
-        }
+               if (status == STATUS_SUCCESS) {
+                       priv->packetsSent++;
+               } else {
+                       DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO
+                               "Send USB error! [%08xh]\n", status);
+                       priv->packetsSentDropped++;
+               }
 
-    }
-    if (pDevice->bLinkPass == true) {
-        if (netif_queue_stopped(pDevice->dev))
-            netif_wake_queue(pDevice->dev);
-    }
-    pContext->bBoolInUse = false;
+       }
 
-    return;
+       if (priv->bLinkPass == true) {
+               if (netif_queue_stopped(priv->dev))
+                       netif_wake_queue(priv->dev);
+       }
+
+       context->bBoolInUse = false;
+
+       return;
 }