diff options
| author | Malcolm Priestley | 2014-02-25 21:51:49 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2014-02-27 22:04:36 +0100 |
| commit | d4fa2ab067be4635ea6e53fafd53624ccec5d191 (patch) | |
| tree | 5f556e5f96b42aa8c9d2be54e15149dca0b38a75 /drivers/staging/vt6656 | |
| parent | staging: vt6656: s_nsBulkInUsbIoCompleteRead Replace error handling. (diff) | |
| download | kernel-qcow2-linux-d4fa2ab067be4635ea6e53fafd53624ccec5d191.tar.gz kernel-qcow2-linux-d4fa2ab067be4635ea6e53fafd53624ccec5d191.tar.xz kernel-qcow2-linux-d4fa2ab067be4635ea6e53fafd53624ccec5d191.zip | |
staging: vt6656: clean up s_nsBulkInUsbIoCompleteRead
Clean up white space and camel case.
Camel case changes
pDevice -> priv
pRCB -> rcb
bReAllocSkb -> re_alloc_skb
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/vt6656')
| -rw-r--r-- | drivers/staging/vt6656/usbpipe.c | 49 |
1 files changed, 27 insertions, 22 deletions
diff --git a/drivers/staging/vt6656/usbpipe.c b/drivers/staging/vt6656/usbpipe.c index 1cab7a321bf6..8092c9a9668c 100644 --- a/drivers/staging/vt6656/usbpipe.c +++ b/drivers/staging/vt6656/usbpipe.c @@ -467,16 +467,16 @@ int PIPEnsBulkInUsbRead(struct vnt_private *pDevice, struct vnt_rcb *pRCB) static void s_nsBulkInUsbIoCompleteRead(struct urb *urb) { - struct vnt_rcb *pRCB = (struct vnt_rcb *)urb->context; - struct vnt_private *pDevice = pRCB->pDevice; - int bReAllocSkb = false; + struct vnt_rcb *rcb = (struct vnt_rcb *)urb->context; + struct vnt_private *priv = rcb->pDevice; + int re_alloc_skb = false; - DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"---->s_nsBulkInUsbIoCompleteRead\n"); + DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"---->s_nsBulkInUsbIoCompleteRead\n"); switch (urb->status) { case 0: - pDevice->ulBulkInContCRCError = 0; - pDevice->ulBulkInBytesRead += urb->actual_length; + priv->ulBulkInContCRCError = 0; + priv->ulBulkInBytesRead += urb->actual_length; break; case -ECONNRESET: case -ENOENT: @@ -484,28 +484,33 @@ static void s_nsBulkInUsbIoCompleteRead(struct urb *urb) return; case -ETIMEDOUT: default: - pDevice->ulBulkInError++; + priv->ulBulkInError++; DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "BULK In failed %d\n", urb->status); break; } - if (urb->actual_length) { - spin_lock(&pDevice->lock); - if (RXbBulkInProcessData(pDevice, pRCB, urb->actual_length) == true) - bReAllocSkb = true; - spin_unlock(&pDevice->lock); - } - pRCB->Ref--; - if (pRCB->Ref == 0) - { - DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"RxvFreeNormal %d \n",pDevice->NumRecvFreeList); - spin_lock(&pDevice->lock); - RXvFreeRCB(pRCB, bReAllocSkb); - spin_unlock(&pDevice->lock); - } + if (urb->actual_length) { + spin_lock(&priv->lock); + + if (RXbBulkInProcessData(priv, rcb, urb->actual_length) == true) + re_alloc_skb = true; + + spin_unlock(&priv->lock); + } - return; + rcb->Ref--; + if (rcb->Ref == 0) { + DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"RxvFreeNormal %d\n", + priv->NumRecvFreeList); + spin_lock(&priv->lock); + + RXvFreeRCB(rcb, re_alloc_skb); + + spin_unlock(&priv->lock); + } + + return; } /* |