fixed all the errors found by checkpatch.pl

Signed-off-by: Gokulnath A <gokulnath.avanashilin...@in.bosch.com>
---
 drivers/staging/bcm/InterfaceTx.c | 123 ++++++++++++++++----------------------
 1 file changed, 51 insertions(+), 72 deletions(-)

diff --git a/drivers/staging/bcm/InterfaceTx.c 
b/drivers/staging/bcm/InterfaceTx.c
index b9c2784..682a7ac 100644
--- a/drivers/staging/bcm/InterfaceTx.c
+++ b/drivers/staging/bcm/InterfaceTx.c
@@ -3,7 +3,7 @@
 /*this is transmit call-back(BULK OUT)*/
 static void write_bulk_callback(struct urb *urb/*, struct pt_regs *regs*/)
 {
-       struct bcm_usb_tcb *pTcb= (struct bcm_usb_tcb *)urb->context;
+       struct bcm_usb_tcb *pTcb = (struct bcm_usb_tcb *)urb->context;
        struct bcm_interface_adapter *psIntfAdapter = pTcb->psIntfAdapter;
        struct bcm_link_request *pControlMsg = (struct bcm_link_request 
*)urb->transfer_buffer;
        struct bcm_mini_adapter *psAdapter = psIntfAdapter->psAdapter ;
@@ -13,16 +13,12 @@ static void write_bulk_callback(struct urb *urb/*, struct 
pt_regs *regs*/)
     if (unlikely(netif_msg_tx_done(Adapter)))
            pr_info(PFX "%s: transmit status %d\n", Adapter->dev->name, 
urb->status);
 
-       if(urb->status != STATUS_SUCCESS)
-       {
-               if(urb->status == -EPIPE)
-               {
+       if (urb->status != STATUS_SUCCESS) {
+               if (urb->status == -EPIPE) {
                        psIntfAdapter->psAdapter->bEndPointHalted = TRUE ;
                        
wake_up(&psIntfAdapter->psAdapter->tx_packet_wait_queue);
-               }
-               else
-               {
-                       BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, NEXT_SEND, 
DBG_LVL_ALL,"Tx URB has got cancelled. status :%d", urb->status);
+               } else {
+                       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, NEXT_SEND, 
DBG_LVL_ALL, "Tx URB has got cancelled. status :%d", urb->status);
                }
        }
 
@@ -31,69 +27,61 @@ static void write_bulk_callback(struct urb *urb/*, struct 
pt_regs *regs*/)
 
 
 
-       if(TRUE == psAdapter->bPreparingForLowPowerMode)
-       {
+       if (TRUE == psAdapter->bPreparingForLowPowerMode) {
 
-               if(((pControlMsg->szData[0] == GO_TO_IDLE_MODE_PAYLOAD) &&
+               if (((pControlMsg->szData[0] == GO_TO_IDLE_MODE_PAYLOAD) &&
                        (pControlMsg->szData[1] == TARGET_CAN_GO_TO_IDLE_MODE)))
 
                {
                        bpowerDownMsg = TRUE ;
-                       //This covers the bus err while Idle Request msg sent 
down.
-                       if(urb->status != STATUS_SUCCESS)
-                       {
+                       /* This covers the bus err while Idle Request msg sent 
down. */
+                       if (urb->status != STATUS_SUCCESS) {
                                psAdapter->bPreparingForLowPowerMode = false ;
-                               BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, NEXT_SEND, 
DBG_LVL_ALL,"Idle Mode Request msg failed to reach to Modem");
-                               //Signalling the cntrl pkt path in Ioctl
+                               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, 
NEXT_SEND, DBG_LVL_ALL, "Idle Mode Request msg failed to reach to Modem");
+                               /* Signalling the cntrl pkt path in Ioctl */
                                wake_up(&psAdapter->lowpower_mode_wait_queue);
                                StartInterruptUrb(psIntfAdapter);
                                goto err_exit;
                        }
 
-                       if(psAdapter->bDoSuspend == false)
-                       {
+                       if (psAdapter->bDoSuspend == false) {
                                psAdapter->IdleMode = TRUE;
-                               //since going in Idle mode completed hence 
making this var false;
+                               /* since going in Idle mode completed hence 
making this var false; */
                                psAdapter->bPreparingForLowPowerMode = false ;
 
-                               BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, NEXT_SEND, 
DBG_LVL_ALL, "Host Entered in Idle Mode State...");
-                               //Signalling the cntrl pkt path in Ioctl
+                               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, 
NEXT_SEND, DBG_LVL_ALL, "Host Entered in Idle Mode State...");
+                               /* Signalling the cntrl pkt path in Ioctl */
                                wake_up(&psAdapter->lowpower_mode_wait_queue);
                        }
 
-               }
-               else if((pControlMsg->Leader.Status == LINK_UP_CONTROL_REQ) &&
+               } else if ((pControlMsg->Leader.Status == LINK_UP_CONTROL_REQ) 
&&
                        (pControlMsg->szData[0] == LINK_UP_ACK) &&
                        (pControlMsg->szData[1] == 
LINK_SHUTDOWN_REQ_FROM_FIRMWARE)  &&
-                       (pControlMsg->szData[2] == SHUTDOWN_ACK_FROM_DRIVER))
-               {
-                       //This covers the bus err while shutdown Request msg 
sent down.
-                       if(urb->status != STATUS_SUCCESS)
-                       {
+                       (pControlMsg->szData[2] == SHUTDOWN_ACK_FROM_DRIVER)) {
+                       /* This covers the bus err while shutdown Request msg 
sent down. */
+                       if (urb->status != STATUS_SUCCESS) {
                                psAdapter->bPreparingForLowPowerMode = false ;
-                               BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, NEXT_SEND, 
DBG_LVL_ALL,"Shutdown Request Msg failed to reach to Modem");
-                               //Signalling the cntrl pkt path in Ioctl
+                               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, 
NEXT_SEND, DBG_LVL_ALL, "Shutdown Request Msg failed to reach to Modem");
+                               /* Signalling the cntrl pkt path in Ioctl */
                                wake_up(&psAdapter->lowpower_mode_wait_queue);
                                StartInterruptUrb(psIntfAdapter);
                                goto err_exit;
                        }
 
                        bpowerDownMsg = TRUE ;
-                       if(psAdapter->bDoSuspend == false)
-                       {
+                       if (psAdapter->bDoSuspend == false) {
                                psAdapter->bShutStatus = TRUE;
-                               //since going in shutdown mode completed hence 
making this var false;
+                               /* since going in shutdown mode completed hence 
making this var false; */
                                psAdapter->bPreparingForLowPowerMode = false ;
-                               BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, NEXT_SEND, 
DBG_LVL_ALL,"Host Entered in shutdown Mode State...");
-                               //Signalling the cntrl pkt path in Ioctl
+                               BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, 
NEXT_SEND, DBG_LVL_ALL, "Host Entered in shutdown Mode State...");
+                               /* Signalling the cntrl pkt path in Ioctl */
                                wake_up(&psAdapter->lowpower_mode_wait_queue);
                        }
                }
 
-               if(psAdapter->bDoSuspend && bpowerDownMsg)
-               {
-                       //issuing bus suspend request
-                       BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, NEXT_SEND, 
DBG_LVL_ALL,"Issuing the Bus suspend request to USB stack");
+               if (psAdapter->bDoSuspend && bpowerDownMsg) {
+                       /* issuing bus suspend request */
+                       BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, NEXT_SEND, 
DBG_LVL_ALL, "Issuing the Bus suspend request to USB stack");
                        psIntfAdapter->bPreparingForBusSuspend = TRUE;
                        schedule_work(&psIntfAdapter->usbSuspendWork);
 
@@ -101,9 +89,9 @@ static void write_bulk_callback(struct urb *urb/*, struct 
pt_regs *regs*/)
 
        }
 
-err_exit :
+err_exit:
        usb_free_coherent(urb->dev, urb->transfer_buffer_length,
-                       urb->transfer_buffer, urb->transfer_dma);
+                       urb->transfer_buffer, urb->transfer_dma);
 }
 
 
@@ -112,14 +100,13 @@ static struct bcm_usb_tcb *GetBulkOutTcb(struct 
bcm_interface_adapter *psIntfAda
        struct bcm_usb_tcb *pTcb = NULL;
        UINT index = 0;
 
-       if((atomic_read(&psIntfAdapter->uNumTcbUsed) < MAXIMUM_USB_TCB) &&
-               (psIntfAdapter->psAdapter->StopAllXaction ==false))
-       {
+       if ((atomic_read(&psIntfAdapter->uNumTcbUsed) < MAXIMUM_USB_TCB) &&
+               (psIntfAdapter->psAdapter->StopAllXaction == false)) {
                index = atomic_read(&psIntfAdapter->uCurrTcb);
                pTcb = &psIntfAdapter->asUsbTcb[index];
                pTcb->bUsed = TRUE;
-               pTcb->psIntfAdapter= psIntfAdapter;
-               BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_TX, 
NEXT_SEND, DBG_LVL_ALL, "Got Tx desc %d used %d",
+               pTcb->psIntfAdapter = psIntfAdapter;
+               BCM_DEBUG_PRINT(psIntfAdapter->psAdapter, DBG_TYPE_TX, 
NEXT_SEND, DBG_LVL_ALL, "Got Tx desc %d used %d",
                        index, atomic_read(&psIntfAdapter->uNumTcbUsed));
                index = (index + 1) % MAXIMUM_USB_TCB;
                atomic_set(&psIntfAdapter->uCurrTcb, index);
@@ -135,43 +122,36 @@ static int TransmitTcb(struct bcm_interface_adapter 
*psIntfAdapter, struct bcm_u
        int retval = 0;
 
        urb->transfer_buffer = usb_alloc_coherent(psIntfAdapter->udev, len,
-                                               GFP_ATOMIC, &urb->transfer_dma);
-       if (!urb->transfer_buffer)
-       {
-               BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_PRINTK, 0, 0, 
"Error allocating memory\n");
+                                       GFP_ATOMIC, &urb->transfer_dma);
+       if (!urb->transfer_buffer) {
+               BCM_DEBUG_PRINT(psIntfAdapter->psAdapter, DBG_TYPE_PRINTK, 0, 
0, "Error allocating memory\n");
                return  -ENOMEM;
        }
        memcpy(urb->transfer_buffer, data, len);
        urb->transfer_buffer_length = len;
 
-       BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_TX, NEXT_SEND, 
DBG_LVL_ALL, "Sending Bulk out packet\n");
-       //For T3B,INT OUT end point will be used as bulk out end point
-       if((psIntfAdapter->psAdapter->chip_id == T3B) && 
(psIntfAdapter->bHighSpeedDevice == TRUE))
-       {
+       BCM_DEBUG_PRINT(psIntfAdapter->psAdapter, DBG_TYPE_TX, NEXT_SEND, 
DBG_LVL_ALL, "Sending Bulk out packet\n");
+       /* For T3B,INT OUT end point will be used as bulk out end point */
+       if ((psIntfAdapter->psAdapter->chip_id == T3B) && 
(psIntfAdapter->bHighSpeedDevice == TRUE)) {
                usb_fill_int_urb(urb, psIntfAdapter->udev,
-               psIntfAdapter->sBulkOut.bulk_out_pipe,
+                       psIntfAdapter->sBulkOut.bulk_out_pipe,
                        urb->transfer_buffer, len, write_bulk_callback, pTcb,
                        psIntfAdapter->sBulkOut.int_out_interval);
-       }
-       else
-       {
+       } else {
        usb_fill_bulk_urb(urb, psIntfAdapter->udev,
                  psIntfAdapter->sBulkOut.bulk_out_pipe,
                  urb->transfer_buffer, len, write_bulk_callback, pTcb);
        }
        urb->transfer_flags |= URB_NO_TRANSFER_DMA_MAP; /* For DMA transfer */
 
-       if(false == psIntfAdapter->psAdapter->device_removed &&
+       if (false == psIntfAdapter->psAdapter->device_removed &&
           false == psIntfAdapter->psAdapter->bEndPointHalted &&
           false == psIntfAdapter->bSuspended &&
-          false == psIntfAdapter->bPreparingForBusSuspend)
-       {
+          false == psIntfAdapter->bPreparingForBusSuspend) {
                retval = usb_submit_urb(urb, GFP_ATOMIC);
-               if (retval)
-               {
-                       BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_TX, 
NEXT_SEND, DBG_LVL_ALL, "failed submitting write urb, error %d", retval);
-                       if(retval == -EPIPE)
-                       {
+               if (retval) {
+                       BCM_DEBUG_PRINT(psIntfAdapter->psAdapter, DBG_TYPE_TX, 
NEXT_SEND, DBG_LVL_ALL, "failed submitting write urb, error %d", retval);
+                       if (retval == -EPIPE) {
                                psIntfAdapter->psAdapter->bEndPointHalted = 
TRUE ;
                                
wake_up(&psIntfAdapter->psAdapter->tx_packet_wait_queue);
                        }
@@ -182,13 +162,12 @@ static int TransmitTcb(struct bcm_interface_adapter 
*psIntfAdapter, struct bcm_u
 
 int InterfaceTransmitPacket(PVOID arg, PVOID data, UINT len)
 {
-       struct bcm_usb_tcb *pTcb= NULL;
+       struct bcm_usb_tcb *pTcb = NULL;
 
        struct bcm_interface_adapter *psIntfAdapter = arg;
-       pTcb= GetBulkOutTcb(psIntfAdapter);
-       if(pTcb == NULL)
-       {
-               BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_PRINTK, 0, 0, 
"No URB to transmit packet, dropping packet");
+       pTcb = GetBulkOutTcb(psIntfAdapter);
+       if (pTcb == NULL) {
+               BCM_DEBUG_PRINT(psIntfAdapter->psAdapter, DBG_TYPE_PRINTK, 0, 
0, "No URB to transmit packet, dropping packet");
                return -EFAULT;
        }
        return TransmitTcb(psIntfAdapter, pTcb, data, len);
-- 
1.8.1.2

_______________________________________________
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

Reply via email to