Staging:bcm: fix coding style error in InterfaceRx.c
PATCH 4/4 Staging:bcm: fix coding style error in InterfaceRx.c
This is a patch to the InterfaceRx.c file that
fixes up a coding style issues found by the checkpatch.pl tool
Signed-off-by Ilya Gorskin <[email protected]>
--- drivers/staging/bcm/InterfaceRx.c | 239 ++++++++++++++++++++------------------ 1 file changed, 124 insertions(+), 115 deletions(-)
drivers/staging/bcm/InterfaceRx.c +124 -115
@@ -1,11 +1,11 @@#include "headers.h" -static int SearchVcid (struct bcm_mini_adapter *Adapter,unsigned short usVcid) +static int SearchVcid (struct bcm_mini_adapter *Adapter,unsigned short usVcid) { -int iIndex=0 ; +int iIndex =0 ; -for (iIndex=(NO_OF_QUEUES -1 );iIndex>=0 ;iIndex--) -if (Adapter->PackInfo[iIndex].usVCID_Value == usVcid) +for (iIndex = (NO_OF_QUEUES -1 ); iIndex >=0 ; iIndex--) +if (Adapter->PackInfo[iIndex].usVCID_Value == usVcid)return iIndex;return NO_OF_QUEUES +1 ;
@@ -18,15 +18,15 @@ GetBulkInRcb(PS_INTERFACE_ADAPTER psIntfAdapter)PUSB_RCB pRcb =NULL ;UINT index =0 ; -if ((atomic_read (&psIntfAdapter->uNumRcbUsed) <MAXIMUM_USB_RCB ) && - (psIntfAdapter->psAdapter->StopAllXaction == FALSE)) - { +if ((atomic_read (&psIntfAdapter->uNumRcbUsed) <MAXIMUM_USB_RCB ) && + (psIntfAdapter->psAdapter->StopAllXaction == FALSE)) { index =atomic_read (&psIntfAdapter->uCurrRcb); pRcb = &psIntfAdapter->asUsbRcb[index]; pRcb->bUsed = TRUE; - pRcb->psIntfAdapter= psIntfAdapter; -BCM_DEBUG_PRINT (psIntfAdapter->psAdapter,DBG_TYPE_RX ,RX_DPC ,DBG_LVL_ALL ,"Got Rx desc %d used %d" , - index,atomic_read (&psIntfAdapter->uNumRcbUsed)); + pRcb->psIntfAdapter = psIntfAdapter; +BCM_DEBUG_PRINT (psIntfAdapter->psAdapter,DBG_TYPE_RX ,RX_DPC , +DBG_LVL_ALL ,"Got Rx desc %d used %d" , index, +atomic_read (&psIntfAdapter->uNumRcbUsed)); index = (index +1 ) %MAXIMUM_USB_RCB ;atomic_set (&psIntfAdapter->uCurrRcb, index);atomic_inc (&psIntfAdapter->uNumRcbUsed);
@@ -34,15 +34,16 @@ GetBulkInRcb(PS_INTERFACE_ADAPTER psIntfAdapter)return pRcb; } -/*this is receive call back - when pkt available for receive (BULK IN- end point)*/ +/*this is receive call back - +* when pkt available for receive (BULK IN- end point)*/ static void read_bulk_callback (struct urb *urb) {struct sk_buff *skb =NULL ;BOOLEAN bHeaderSupressionEnabled = FALSE;int QueueIndex =NO_OF_QUEUES +1 ; -UINT uiIndex=0 ; +UINT uiIndex =0 ;int process_done =1 ; -//int idleflag = 0 ; +/*int idleflag = 0;*/ PUSB_RCB pRcb = (PUSB_RCB )urb->context;PS_INTERFACE_ADAPTER psIntfAdapter = pRcb->psIntfAdapter;struct bcm_mini_adapter *Adapter = psIntfAdapter->psAdapter;
@@ -52,49 +53,49 @@ static void read_bulk_callback(struct urb *urb)pr_info (PFX "%s: rx urb status %d length %d\n" , Adapter->dev->name, urb->status, urb->actual_length); -if ((Adapter->device_removed == TRUE) || +if ((Adapter->device_removed == TRUE) || (TRUE == Adapter->bEndPointHalted) || - (0 == urb->actual_length) - ) - { - pRcb->bUsed = FALSE; -atomic_dec (&psIntfAdapter->uNumRcbUsed); + (0 == urb->actual_length)) { + pRcb->bUsed = FALSE; +atomic_dec (&psIntfAdapter->uNumRcbUsed);return ; } -if (urb->status !=STATUS_SUCCESS ) - { -if (urb->status == -EPIPE ) - { +if (urb->status !=STATUS_SUCCESS ) { +if (urb->status == -EPIPE ) { Adapter->bEndPointHalted = TRUE ;wake_up (&Adapter->tx_packet_wait_queue); - } -else - { -BCM_DEBUG_PRINT (Adapter,DBG_TYPE_RX ,RX_DPC ,DBG_LVL_ALL ,"Rx URB has got cancelled. status :%d" , urb->status); + }else { +BCM_DEBUG_PRINT (Adapter,DBG_TYPE_RX ,RX_DPC , +DBG_LVL_ALL ,"Rx URB has got cancelled. + status :%d", urb->status); } pRcb->bUsed = FALSE; -atomic_dec (&psIntfAdapter->uNumRcbUsed); - urb->status =STATUS_SUCCESS ; +atomic_dec (&psIntfAdapter->uNumRcbUsed); + urb->status =STATUS_SUCCESS ;return ; } -if (Adapter->bDoSuspend && (Adapter->bPreparingForLowPowerMode)) - { -BCM_DEBUG_PRINT (Adapter,DBG_TYPE_RX ,RX_DPC ,DBG_LVL_ALL ,"device is going in low power mode while PMU option selected..hence rx packet should not be process" ); +if (Adapter->bDoSuspend && (Adapter->bPreparingForLowPowerMode)) { +BCM_DEBUG_PRINT (Adapter,DBG_TYPE_RX ,RX_DPC ,DBG_LVL_ALL , + "device is going in low power mode while PMU + option selected..hence rx packet should + not be process"); return ; } -BCM_DEBUG_PRINT (Adapter,DBG_TYPE_RX ,RX_DPC ,DBG_LVL_ALL ,"Read back done len %d\n" , pLeader->PLength); -if (!pLeader->PLength) - { -BCM_DEBUG_PRINT (Adapter,DBG_TYPE_RX ,RX_DPC ,DBG_LVL_ALL ,"Leader Length 0" ); +BCM_DEBUG_PRINT (Adapter,DBG_TYPE_RX ,RX_DPC ,DBG_LVL_ALL , + "Read back done len %d\n", pLeader->PLength); +if (!pLeader->PLength) { +BCM_DEBUG_PRINT (Adapter,DBG_TYPE_RX ,RX_DPC ,DBG_LVL_ALL , +"Leader Length 0" );atomic_dec (&psIntfAdapter->uNumRcbUsed);return ; } -BCM_DEBUG_PRINT (Adapter,DBG_TYPE_RX ,RX_DPC ,DBG_LVL_ALL ,"Leader Status:0x%hX, Length:0x%hX, VCID:0x%hX" , pLeader->Status,pLeader->PLength,pLeader->Vcid); -if (MAX_CNTL_PKT_SIZE < pLeader->PLength) - { +BCM_DEBUG_PRINT (Adapter,DBG_TYPE_RX ,RX_DPC ,DBG_LVL_ALL , +"Leader Status:0x%hX, Length:0x%hX, VCID:0x%hX" , + pLeader->Status, pLeader->PLength, pLeader->Vcid); +if (MAX_CNTL_PKT_SIZE < pLeader->PLength) {if (netif_msg_rx_err (Adapter))pr_info (PFX "%s: corrupted leader length...%d\n" , Adapter->dev->name, pLeader->PLength);
@@ -103,95 +104,99 @@ static void read_bulk_callback(struct urb *urb)return ; } - QueueIndex =SearchVcid ( Adapter,pLeader->Vcid); -if (QueueIndex <NO_OF_QUEUES ) - { + QueueIndex =SearchVcid (Adapter, pLeader->Vcid); +if (QueueIndex <NO_OF_QUEUES ) { bHeaderSupressionEnabled = Adapter->PackInfo[QueueIndex].bHeaderSuppressionEnabled; bHeaderSupressionEnabled = bHeaderSupressionEnabled & Adapter->bPHSEnabled; } - skb =dev_alloc_skb (pLeader->PLength +SKB_RESERVE_PHS_BYTES +SKB_RESERVE_ETHERNET_HEADER );//2 //2 for allignment -if (!skb) - { -BCM_DEBUG_PRINT (Adapter,DBG_TYPE_PRINTK ,0 ,0 ,"NO SKBUFF!!! Dropping the Packet" ); + skb =dev_alloc_skb (pLeader->PLength +SKB_RESERVE_PHS_BYTES + +SKB_RESERVE_ETHERNET_HEADER );/*2 2 for allignment*/ +if (!skb) { +BCM_DEBUG_PRINT (Adapter,DBG_TYPE_PRINTK ,0 ,0 , +"NO SKBUFF!!! Dropping the Packet" );atomic_dec (&psIntfAdapter->uNumRcbUsed);return ; }/* If it is a control Packet, then call handle_bcm_packet ()*/ -if ((ntohs (pLeader->Vcid) ==VCID_CONTROL_PACKET ) || - (!(pLeader->Status >=0x20 && pLeader->Status <=0x3F ))) - { -BCM_DEBUG_PRINT (psIntfAdapter->psAdapter,DBG_TYPE_RX ,RX_CTRL ,DBG_LVL_ALL ,"Received control pkt..." ); +if ((ntohs (pLeader->Vcid) ==VCID_CONTROL_PACKET ) || + (!(pLeader->Status >=0x20 && pLeader->Status <=0x3F ))) { +M_DEBUG_PRINT (psIntfAdapter->psAdapter,DBG_TYPE_RX ,RX_CTRL , +DBG_LVL_ALL ,"Received control pkt..." ); *(PUSHORT )skb->data = pLeader->Status; -memcpy (skb->data+sizeof (USHORT ), urb->transfer_buffer + +memcpy (skb->data+sizeof (USHORT ), urb->transfer_buffer + (sizeof (struct bcm_leader )), pLeader->PLength); skb->len = pLeader->PLength +sizeof (USHORT );spin_lock (&Adapter->control_queue_lock); -ENQUEUEPACKET (Adapter->RxControlHead,Adapter->RxControlTail,skb); +ENQUEUEPACKET (Adapter->RxControlHead, Adapter->RxControlTail, + skb);spin_unlock (&Adapter->control_queue_lock);atomic_inc (&Adapter->cntrlpktCnt);wake_up (&Adapter->process_rx_cntrlpkt); - } -else - { + }else {/* -* Data Packet, Format a proper Ethernet Header -* and give it to the stack -*/ -BCM_DEBUG_PRINT (psIntfAdapter->psAdapter,DBG_TYPE_RX ,RX_DATA ,DBG_LVL_ALL ,"Received Data pkt..." ); +* Data Packet, Format a proper Ethernet Header +* and give it to the stack +*/ +BCM_DEBUG_PRINT (psIntfAdapter->psAdapter,DBG_TYPE_RX ,RX_DATA , +DBG_LVL_ALL ,"Received Data pkt..." );skb_reserve (skb,2 +SKB_RESERVE_PHS_BYTES ); -memcpy (skb->data+ETH_HLEN , (PUCHAR )urb->transfer_buffer +sizeof (struct bcm_leader ), pLeader->PLength); +memcpy (skb->data+ETH_HLEN , (PUCHAR )urb->transfer_buffer + +sizeof (struct bcm_leader ), pLeader->PLength); skb->dev = Adapter->dev; -/* currently skb->len has extra ETH_HLEN bytes in the beginning */ -skb_put (skb, pLeader->PLength +ETH_HLEN ); - Adapter->PackInfo[QueueIndex].uiTotalRxBytes+=pLeader->PLength; - Adapter->PackInfo[QueueIndex].uiThisPeriodRxBytes+= pLeader->PLength; -BCM_DEBUG_PRINT (psIntfAdapter->psAdapter,DBG_TYPE_RX ,RX_DATA ,DBG_LVL_ALL ,"Received Data pkt of len :0x%X" , pLeader->PLength); - -if (netif_running (Adapter->dev)) - { -/* Moving ahead by ETH_HLEN to the data ptr as received from FW */ +/* currently skb->len has extra +* ETH_HLEN bytes in the beginning */ +skb_put (skb, pLeader->PLength +ETH_HLEN ); + Adapter->PackInfo[QueueIndex].uiTotalRxBytes += + pLeader->PLength; + Adapter->PackInfo[QueueIndex].uiThisPeriodRxBytes += + pLeader->PLength; +BCM_DEBUG_PRINT (psIntfAdapter->psAdapter,DBG_TYPE_RX ,RX_DATA , +DBG_LVL_ALL ,"Received Data pkt of len :0x%X" , + pLeader->PLength); + +if (netif_running (Adapter->dev)) { +/* Moving ahead by ETH_HLEN to +* the data ptr as received from FW */ skb_pull (skb,ETH_HLEN );PHSReceive (Adapter, pLeader->Vcid, skb, &skb->len, -NULL ,bHeaderSupressionEnabled); +NULL , bHeaderSupressionEnabled); -if (!Adapter->PackInfo[QueueIndex].bEthCSSupport) - { +if (!Adapter->PackInfo[QueueIndex].bEthCSSupport) {skb_push (skb,ETH_HLEN ); -memcpy (skb->data, skb->dev->dev_addr,6 );memcpy (skb->data+6 , skb->dev->dev_addr,6 ); (*(skb->data+11 ))++; *(skb->data+12 ) =0x08 ; *(skb->data+13 ) =0x00 ; - pLeader->PLength+=ETH_HLEN ; + pLeader->PLength +=ETH_HLEN ; } skb->protocol =eth_type_trans (skb, Adapter->dev); process_done =netif_rx (skb); - } -else - { -BCM_DEBUG_PRINT (psIntfAdapter->psAdapter,DBG_TYPE_RX ,RX_DATA ,DBG_LVL_ALL ,"i/f not up hance freeing SKB..." ); + }else { +BCM_DEBUG_PRINT (psIntfAdapter->psAdapter,DBG_TYPE_RX ,RX_DATA , +DBG_LVL_ALL ,"i/f not up hance freeing SKB..." );dev_kfree_skb (skb); } ++Adapter->dev->stats.rx_packets; Adapter->dev->stats.rx_bytes += pLeader->PLength; -for (uiIndex =0 ; uiIndex <MIBS_MAX_HIST_ENTRIES ; uiIndex++) - { -if ((pLeader->PLength <=MIBS_PKTSIZEHIST_RANGE *(uiIndex+1 )) - && (pLeader->PLength >MIBS_PKTSIZEHIST_RANGE *(uiIndex))) +for (uiIndex =0 ; uiIndex <MIBS_MAX_HIST_ENTRIES ; uiIndex++) { +if ((pLeader->PLength <= +MIBS_PKTSIZEHIST_RANGE *(uiIndex+1 )) + && (pLeader->PLength > +MIBS_PKTSIZEHIST_RANGE *(uiIndex))) Adapter->aRxPktSizeHist[uiIndex]++; } } - Adapter->PrevNumRecvDescs++; + Adapter->PrevNumRecvDescs++; pRcb->bUsed = FALSE;atomic_dec (&psIntfAdapter->uNumRcbUsed); }
@@ -202,23 +207,27 @@ static int ReceiveRcb(PS_INTERFACE_ADAPTER psIntfAdapter, PUSB_RCB pRcb)int retval =0 ;usb_fill_bulk_urb (urb, psIntfAdapter->udev,usb_rcvbulkpipe ( - psIntfAdapter->udev, psIntfAdapter->sBulkIn.bulk_in_endpointAddr), - urb->transfer_buffer,BCM_USB_MAX_READ_LENGTH , read_bulk_callback, - pRcb); -if (FALSE == psIntfAdapter->psAdapter->device_removed && - FALSE == psIntfAdapter->psAdapter->bEndPointHalted && - FALSE == psIntfAdapter->bSuspended && - FALSE == psIntfAdapter->bPreparingForBusSuspend) - { + psIntfAdapter->udev, + psIntfAdapter->sBulkIn.bulk_in_endpointAddr), + urb->transfer_buffer,BCM_USB_MAX_READ_LENGTH , + read_bulk_callback, pRcb); +if (FALSE == psIntfAdapter->psAdapter->device_removed && + FALSE == psIntfAdapter->psAdapter->bEndPointHalted && + FALSE == psIntfAdapter->bSuspended && + FALSE == psIntfAdapter->bPreparingForBusSuspend) { retval =usb_submit_urb (urb,GFP_ATOMIC ); -if (retval) - { -BCM_DEBUG_PRINT (psIntfAdapter->psAdapter,DBG_TYPE_RX ,RX_DPC ,DBG_LVL_ALL ,"failed submitting read urb, error %d" , retval); -//if this return value is because of pipe halt. need to clear this. -if (retval == -EPIPE ) - { - psIntfAdapter->psAdapter->bEndPointHalted = TRUE ; -wake_up (&psIntfAdapter->psAdapter->tx_packet_wait_queue); +if (retval) { +BCM_DEBUG_PRINT (psIntfAdapter->psAdapter,DBG_TYPE_RX , +RX_DPC ,DBG_LVL_ALL , +"failed submitting read urb, error %d" , + retval); +/*if this return value is because of pipe halt. +* need to clear this.*/ +if (retval == -EPIPE ) { + psIntfAdapter->psAdapter->bEndPointHalted = + TRUE; +wake_up ( + &psIntfAdapter->psAdapter->tx_packet_wait_queue); } }
@@ -228,11 +237,10 @@ static int ReceiveRcb(PS_INTERFACE_ADAPTER psIntfAdapter, PUSB_RCB pRcb)/* Function: InterfaceRx - -Description: This is the hardware specific Function for Receiving -data packet/control packets from the device. - -Input parameters: IN struct bcm_mini_adapter *Adapter - Miniport Adapter Context +Description:This is the hardware specific Function for Receiving +data packet/control packets from the device. +Input parameters: IN struct bcm_mini_adapter +*Adapter - Miniport Adapter Context
@@ -240,25 +248,26 @@ Return: TRUE - If Rx was successful.Other - If an error occurred. */ -BOOLEAN InterfaceRx (PS_INTERFACE_ADAPTER psIntfAdapter) +BOOLEAN InterfaceRx (PS_INTERFACE_ADAPTER psIntfAdapter) { -USHORT RxDescCount =NUM_RX_DESC -atomic_read (&psIntfAdapter->uNumRcbUsed); +USHORT RxDescCount =NUM_RX_DESC - +atomic_read (&psIntfAdapter->uNumRcbUsed);PUSB_RCB pRcb =NULL ; -// RxDescCount = psIntfAdapter->psAdapter->CurrNumRecvDescs - -// psIntfAdapter->psAdapter->PrevNumRecvDescs; -while (RxDescCount) - { +/*RxDescCount = psIntfAdapter->psAdapter->CurrNumRecvDescs - +psIntfAdapter->psAdapter->PrevNumRecvDescs;*/ +while (RxDescCount) { pRcb =GetBulkInRcb (psIntfAdapter); -if (pRcb ==NULL ) - { -BCM_DEBUG_PRINT (psIntfAdapter->psAdapter,DBG_TYPE_PRINTK ,0 ,0 ,"Unable to get Rcb pointer" ); +if (pRcb ==NULL ) { +BCM_DEBUG_PRINT (psIntfAdapter->psAdapter, +DBG_TYPE_PRINTK ,0 ,0 , +"Unable to get Rcb pointer" );return FALSE; } -//atomic_inc(&psIntfAdapter->uNumRcbUsed); +/*atomic_inc(&psIntfAdapter->uNumRcbUsed);*/ ReceiveRcb (psIntfAdapter, pRcb); RxDescCount--; - } + }return TRUE; }
Signature · 1 line
1.7.12