From 3f38290e3b691dd8bef4916fd8610319fe0023b7 Mon Sep 17 00:00:00 2001 From: Malcolm Priestley Date: Tue, 25 Feb 2014 20:51:45 +0000 Subject: [PATCH] staging: vt6656: clean up PIPEnsSendBulkOut. Remove commented out code, white space and camel case. camel case changes pDevice -> priv pContext -> context pUrb -> urb Signed-off-by: Malcolm Priestley Signed-off-by: Greg Kroah-Hartman --- drivers/staging/vt6656/usbpipe.c | 61 ++++++++++++++------------------ 1 file changed, 26 insertions(+), 35 deletions(-) diff --git a/drivers/staging/vt6656/usbpipe.c b/drivers/staging/vt6656/usbpipe.c index 706c1633fef..9a922b4a697 100644 --- a/drivers/staging/vt6656/usbpipe.c +++ b/drivers/staging/vt6656/usbpipe.c @@ -528,50 +528,41 @@ static void s_nsBulkInUsbIoCompleteRead(struct urb *urb) * */ -int PIPEnsSendBulkOut(struct vnt_private *pDevice, - struct vnt_usb_send_context *pContext) +int PIPEnsSendBulkOut(struct vnt_private *priv, + struct vnt_usb_send_context *context) { int status; - struct urb *pUrb; + struct urb *urb; - pDevice->bPWBitOn = false; + priv->bPWBitOn = false; -/* - if (pDevice->pPendingBulkOutContext != NULL) { - pDevice->NumContextsQueued++; - EnqueueContext(pDevice->FirstTxContextQueue, pDevice->LastTxContextQueue, pContext); - status = STATUS_PENDING; - DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Send pending!\n"); - return status; - } -*/ - - DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"s_nsSendBulkOut\n"); + DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"s_nsSendBulkOut\n"); - if (!(MP_IS_READY(pDevice) && pDevice->Flags & fMP_POST_WRITES)) { - pContext->bBoolInUse = false; + if (!(MP_IS_READY(priv) && priv->Flags & fMP_POST_WRITES)) { + context->bBoolInUse = false; return STATUS_RESOURCES; } - pUrb = pContext->pUrb; - pDevice->ulBulkOutPosted++; -// pDevice->pPendingBulkOutContext = pContext; - usb_fill_bulk_urb(pUrb, - pDevice->usb, - usb_sndbulkpipe(pDevice->usb, 3), - pContext->Data, - pContext->uBufLen, + urb = context->pUrb; + priv->ulBulkOutPosted++; + + usb_fill_bulk_urb(urb, + priv->usb, + usb_sndbulkpipe(priv->usb, 3), + context->Data, + context->uBufLen, s_nsBulkOutIoCompleteWrite, - pContext); - - status = usb_submit_urb(pUrb, GFP_ATOMIC); - if (status != 0) - { - DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Submit Tx URB failed %d\n", status); - pContext->bBoolInUse = false; - return STATUS_FAILURE; - } - return STATUS_PENDING; + context); + + status = usb_submit_urb(urb, GFP_ATOMIC); + if (status != 0) { + DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO + "Submit Tx URB failed %d\n", status); + context->bBoolInUse = false; + return STATUS_FAILURE; + } + + return STATUS_PENDING; } /* -- 2.46.0