Staging:bcm: fix coding style error in InterfaceIsr.c
PATCH 2/3 Staging:bcm: fix coding style error in InterfaceIsr.c
This is a patch to the InterfaceIsr.c file that fixes up a coding style issues found by the checkpatch.pl tool
--- drivers/staging/bcm/InterfaceIsr.c | 178 +++++++++++++++++++++---------------- 1 file changed, 102 insertions(+), 76 deletions(-)
drivers/staging/bcm/InterfaceIsr.c +102 -76
@@ -11,101 +11,123 @@ static void read_int_callback(struct urb *urb/*, struct pt_regs *regs*/)pr_info (PFX "%s: interrupt status %d\n" , Adapter->dev->name, status); -if (Adapter->device_removed == TRUE) - { -BCM_DEBUG_PRINT (Adapter,DBG_TYPE_OTHERS ,INTF_INIT ,DBG_LVL_ALL ,"Device has Got Removed." ); +if (Adapter->device_removed == TRUE) { +BCM_DEBUG_PRINT (Adapter,DBG_TYPE_OTHERS ,INTF_INIT , + iDBG_LVL_ALL,"Device has Got Removed." );return ; } -if (((Adapter->bPreparingForLowPowerMode == TRUE) && (Adapter->bDoSuspend == TRUE)) || - psIntfAdapter->bSuspended || - psIntfAdapter->bPreparingForBusSuspend) - { -BCM_DEBUG_PRINT (Adapter,DBG_TYPE_OTHERS ,INTF_INIT ,DBG_LVL_ALL ,"Interrupt call back is called while suspending the device" ); +if (((Adapter->bPreparingForLowPowerMode == TRUE) && + (Adapter->bDoSuspend == TRUE)) || + psIntfAdapter->bSuspended || + psIntfAdapter->bPreparingForBusSuspend) { +BCM_DEBUG_PRINT (Adapter,DBG_TYPE_OTHERS ,INTF_INIT , +DBG_LVL_ALL , + "Interrupt call back is called + while suspending the device"); return ; } -//BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, NEXT_SEND, DBG_LVL_ALL, "interrupt urb status %d", status); + /*BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, NEXT_SEND, DBG_LVL_ALL, + * "interrupt urb status %d", status);*/ switch (status) { -/* success */ -case STATUS_SUCCESS : -if ( urb->actual_length ) - { - -if (psIntfAdapter->ulInterruptData[1 ] &0xFF ) - { -BCM_DEBUG_PRINT (Adapter,DBG_TYPE_OTHERS ,INTF_INIT ,DBG_LVL_ALL ,"Got USIM interrupt" ); +/* success */ +case STATUS_SUCCESS : +if (urb->actual_length) { + +if (psIntfAdapter->ulInterruptData[1 ] &0xFF ) { +BCM_DEBUG_PRINT (Adapter,DBG_TYPE_OTHERS , +INTF_INIT ,DBG_LVL_ALL , +"Got USIM interrupt" ); } -if (psIntfAdapter->ulInterruptData[1 ] &0xFF00 ) - { +if (psIntfAdapter->ulInterruptData[1 ] &0xFF00 ) {atomic_set (&Adapter->CurrNumFreeTxDesc, - (psIntfAdapter->ulInterruptData[1 ] &0xFF00 ) >>8 ); -atomic_set (&Adapter->uiMBupdate, TRUE); -BCM_DEBUG_PRINT (Adapter,DBG_TYPE_OTHERS ,INTF_INIT ,DBG_LVL_ALL ,"TX mailbox contains %d" , -atomic_read (&Adapter->CurrNumFreeTxDesc)); + (psIntfAdapter->ulInterruptData[1 ] & +0xFF00 ) >>8 ); +atomic_set (&Adapter->uiMBupdate, TRUE); +BCM_DEBUG_PRINT (Adapter,DBG_TYPE_OTHERS , +INTF_INIT ,DBG_LVL_ALL , +"TX mailbox contains %d" , +atomic_read (&Adapter->CurrNumFreeTxDesc)); } -if (psIntfAdapter->ulInterruptData[1 ] >>16 ) - { - Adapter->CurrNumRecvDescs= - (psIntfAdapter->ulInterruptData[1 ] >>16 ); -BCM_DEBUG_PRINT (Adapter,DBG_TYPE_OTHERS ,INTF_INIT ,DBG_LVL_ALL ,"RX mailbox contains %d" , +if (psIntfAdapter->ulInterruptData[1 ] >>16 ) { + Adapter->CurrNumRecvDescs = + (psIntfAdapter->ulInterruptData[1 ] >>16 ); +BCM_DEBUG_PRINT (Adapter,DBG_TYPE_OTHERS , +INTF_INIT ,DBG_LVL_ALL , +"RX mailbox contains %d" , Adapter->CurrNumRecvDescs);InterfaceRx (psIntfAdapter); } -if (Adapter->fw_download_done && +if (Adapter->fw_download_done && !Adapter->downloadDDR && -atomic_read (&Adapter->CurrNumFreeTxDesc)) - { - psIntfAdapter->psAdapter->downloadDDR +=1 ; +atomic_read (&Adapter->CurrNumFreeTxDesc)) { + psIntfAdapter->psAdapter->downloadDDR +=1 ;wake_up (&Adapter->tx_packet_wait_queue); } -if (FALSE == Adapter->waiting_to_fw_download_done) - { +if (FALSE == Adapter->waiting_to_fw_download_done) { Adapter->waiting_to_fw_download_done = TRUE;wake_up (&Adapter->ioctl_fw_dnld_wait_queue); } -if (!atomic_read (&Adapter->TxPktAvail)) - { +if (!atomic_read (&Adapter->TxPktAvail)) {atomic_set (&Adapter->TxPktAvail,1 );wake_up (&Adapter->tx_packet_wait_queue); } -BCM_DEBUG_PRINT (Adapter,DBG_TYPE_OTHERS ,INTF_INIT ,DBG_LVL_ALL ,"Firing interrupt in URB" ); +BCM_DEBUG_PRINT (Adapter,DBG_TYPE_OTHERS ,INTF_INIT , +DBG_LVL_ALL ,"Firing interrupt in URB" ); }break ; -case -ENOENT : +case -ENOENT : { -BCM_DEBUG_PRINT (Adapter,DBG_TYPE_OTHERS ,INTF_INIT ,DBG_LVL_ALL ,"URB has got disconnected ...." ); +BCM_DEBUG_PRINT (Adapter,DBG_TYPE_OTHERS ,INTF_INIT , +DBG_LVL_ALL , +"URB has got disconnected ...." );return ; } -case -EINPROGRESS : +case -EINPROGRESS : { -//This situation may happened when URBunlink is used. for detail check usb_unlink_urb documentation. -BCM_DEBUG_PRINT (Adapter,DBG_TYPE_OTHERS ,INTF_INIT ,DBG_LVL_ALL ,"Impossibe condition has occurred... something very bad is going on" ); +/*This situation may happened when URBunlink is used. +* for detail check usb_unlink_urb documentation.*/ +BCM_DEBUG_PRINT (Adapter,DBG_TYPE_OTHERS ,INTF_INIT , +DBG_LVL_ALL , + "Impossibe condition has occurred... + something very bad is going on"); break ; -//return; + /*return;*/ } -case -EPIPE : + case -EPIPE: { -BCM_DEBUG_PRINT (Adapter,DBG_TYPE_OTHERS ,INTF_INIT ,DBG_LVL_ALL ,"Interrupt IN endPoint has got halted/stalled...need to clear this" ); +BCM_DEBUG_PRINT (Adapter,DBG_TYPE_OTHERS , +INTF_INIT ,DBG_LVL_ALL , + "Interrupt IN endPoint + has got halted/stalled... + need to clear this"); Adapter->bEndPointHalted = TRUE ; wake_up(&Adapter->tx_packet_wait_queue); urb->status =STATUS_SUCCESS ;return ; } -/* software-driven interface shutdown */ -case -ECONNRESET ://URB got unlinked. -case -ESHUTDOWN :// hardware gone. this is the serious problem. -//Occurs only when something happens with the host controller device -case -ENODEV ://Device got removed -case -EINVAL ://Some thing very bad happened with the URB. No description is available. -BCM_DEBUG_PRINT (Adapter,DBG_TYPE_OTHERS ,INTF_INIT ,DBG_LVL_ALL ,"interrupt urb error %d" , status); +/* software-driven interface shutdown */ +case -ECONNRESET :/*URB got unlinked.*/ +case -ESHUTDOWN :/* hardware gone. this is the serious problem.*/ +/*Occurs only when something happens with the host controller device*/ +case -ENODEV :/*Device got removed*/ +case -EINVAL :/*Some thing very bad happened with the URB. +No description is available.*/ +BCM_DEBUG_PRINT (Adapter,DBG_TYPE_OTHERS ,INTF_INIT , +DBG_LVL_ALL ,"interrupt urb error %d" , status); urb->status =STATUS_SUCCESS ;break ; -//return; -default : -//This is required to check what is the defaults conditions when it occurs.. -BCM_DEBUG_PRINT (Adapter,DBG_TYPE_TX ,NEXT_SEND ,DBG_LVL_ALL ,"GOT DEFAULT INTERRUPT URB STATUS :%d..Please Analyze it..." , status); +/*return;*/ +default : +/*This is required to check what is the defaults +* conditions when it occurs..*/ +BCM_DEBUG_PRINT (Adapter,DBG_TYPE_TX ,NEXT_SEND , +DBG_LVL_ALL , +"GOT DEFAULT INTERRUPT URB + STATUS :%d..Please Analyze it...", + status);break ; }
@@ -117,27 +139,29 @@ static void read_int_callback(struct urb *urb/*, struct pt_regs *regs*/)int CreateInterruptUrb (PS_INTERFACE_ADAPTER psIntfAdapter) { psIntfAdapter->psInterruptUrb =usb_alloc_urb (0 ,GFP_KERNEL ); -if (!psIntfAdapter->psInterruptUrb) - { -BCM_DEBUG_PRINT (psIntfAdapter->psAdapter,DBG_TYPE_OTHERS ,INTF_INIT ,DBG_LVL_ALL ,"Cannot allocate interrupt urb" ); +if (!psIntfAdapter->psInterruptUrb) { +BCM_DEBUG_PRINT (psIntfAdapter->psAdapter,DBG_TYPE_OTHERS , +INTF_INIT ,DBG_LVL_ALL , +"Cannot allocate interrupt urb" );return -ENOMEM ; } psIntfAdapter->psInterruptUrb->transfer_buffer = - psIntfAdapter->ulInterruptData; + psIntfAdapter->ulInterruptData; psIntfAdapter->psInterruptUrb->transfer_buffer_length = -sizeof (psIntfAdapter->ulInterruptData); +sizeof (psIntfAdapter->ulInterruptData); psIntfAdapter->sIntrIn.int_in_pipe =usb_rcvintpipe (psIntfAdapter->udev, - psIntfAdapter->sIntrIn.int_in_endpointAddr); + psIntfAdapter->sIntrIn.int_in_endpointAddr);usb_fill_int_urb (psIntfAdapter->psInterruptUrb, psIntfAdapter->udev, psIntfAdapter->sIntrIn.int_in_pipe, - psIntfAdapter->psInterruptUrb->transfer_buffer, - psIntfAdapter->psInterruptUrb->transfer_buffer_length, + psIntfAdapter->psInterruptUrb->transfer_buffer, + psIntfAdapter->psInterruptUrb->transfer_buffer_length, read_int_callback, psIntfAdapter, psIntfAdapter->sIntrIn.int_in_interval); -BCM_DEBUG_PRINT (psIntfAdapter->psAdapter,DBG_TYPE_OTHERS ,INTF_INIT ,DBG_LVL_ALL ,"Interrupt Interval: %d\n" , +BCM_DEBUG_PRINT (psIntfAdapter->psAdapter,DBG_TYPE_OTHERS ,INTF_INIT , +DBG_LVL_ALL ,"Interrupt Interval: %d\n" , psIntfAdapter->sIntrIn.int_in_interval);return 0 ; }
@@ -147,20 +171,22 @@ INT StartInterruptUrb(PS_INTERFACE_ADAPTER psIntfAdapter) {INT status =0 ; -if ( FALSE == psIntfAdapter->psAdapter->device_removed && +if (FALSE == psIntfAdapter->psAdapter->device_removed && FALSE == psIntfAdapter->psAdapter->bEndPointHalted && FALSE == psIntfAdapter->bSuspended && FALSE == psIntfAdapter->bPreparingForBusSuspend && - FALSE == psIntfAdapter->psAdapter->StopAllXaction) - { - status =usb_submit_urb (psIntfAdapter->psInterruptUrb,GFP_ATOMIC ); -if (status) - { -BCM_DEBUG_PRINT (psIntfAdapter->psAdapter,DBG_TYPE_OTHERS ,INTF_INIT ,DBG_LVL_ALL ,"Cannot send int urb %d\n" , status); -if (status == -EPIPE ) - { - psIntfAdapter->psAdapter->bEndPointHalted = TRUE ; -wake_up (&psIntfAdapter->psAdapter->tx_packet_wait_queue); + FALSE == psIntfAdapter->psAdapter->StopAllXaction) { + status =usb_submit_urb (psIntfAdapter->psInterruptUrb, +GFP_ATOMIC ); +if (status) { +BCM_DEBUG_PRINT (psIntfAdapter->psAdapter, +DBG_TYPE_OTHERS ,INTF_INIT , +DBG_LVL_ALL , +"Cannot send int urb %d\n" , status); +if (status == -EPIPE ) { + psIntfAdapter->psAdapter->bEndPointHalted = + TRUE ; +wake_up (&psIntfAdapter->psAdapter->tx_packet_wait_queue); } } }
Signature · 1 line
1.7.12
PATCH 3/3 Staging:bcm: fix coding style error in InterfaceIsr.c
This is a patch to the InterfaceIsr.c file that fixes up a coding style issues found by the checkpatch.pl tool
--- drivers/staging/bcm/InterfaceIsr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/bcm/InterfaceIsr.c +1 -1
@@ -120,7 +120,7 @@ static void read_int_callback(struct urb *urb/*, struct pt_regs *regs*/) urb->status =STATUS_SUCCESS ;break ;/*return;*/ -default : +default :/*This is required to check what is the defaults * conditions when it occurs..*/ BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, NEXT_SEND,
Signature · 1 line
1.7.12
Quoted 2 lines · Gorskin Ilya
This is a patch to the
InterfaceIsr.cfile that fixes up a coding style issues found by the checkpatch.pl tool
I'm afraid all these need to be redone along the lines which I explained in my other email.
Quoted 11 lines
Signed-off-by Ilya Gorskin <[email protected]>--- drivers/staging/bcm/InterfaceIsr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/staging/bcm/InterfaceIsr.c +0
-0
drivers/staging/bcm/InterfaceIsr.c static void read_int_callback(struct urb *urb/*, struct pt_regs *regs*/) · line 126
Quoted 8 lines
drivers/staging/bcm/InterfaceIsr.c +1
-1@@ -120,7 +120,7 @@ static void read_int_callback(struct urb *urb/*, struct pt_regs *regs*/) urb->status =STATUS_SUCCESS ;break ;/*return;*/ -default : +default :/*This is required to check what is the defaults * conditions when it occurs..*/ BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, NEXT_SEND,
Checkpatch is a tool that finds ugly code. You've silenced the warning. The code still looks like dog vommit, but now checkpatch doesn't find it. Don't do that.
regards,
dan carpenter
Quoted 4 lines · Gorskin Ilya
drivers/staging/bcm/InterfaceIsr.c +0
-4-if (((Adapter->bPreparingForLowPowerMode == TRUE) && (Adapter->bDoSuspend == TRUE)) || - psIntfAdapter->bSuspended || - psIntfAdapter->bPreparingForBusSuspend) - {
drivers/staging/bcm/InterfaceIsr.c static void read_int_callback(struct urb *urb/*, struct pt_regs *regs*/) · line 28
Quoted 10 lines
drivers/staging/bcm/InterfaceIsr.c +8
-1-BCM_DEBUG_PRINT (Adapter,DBG_TYPE_OTHERS ,INTF_INIT ,DBG_LVL_ALL ,"Interrupt call back is called while suspending the device" ); + if (((Adapter->bPreparingForLowPowerMode == TRUE) && + (Adapter->bDoSuspend == TRUE)) || + psIntfAdapter->bSuspended || + psIntfAdapter->bPreparingForBusSuspend) { + BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, INTF_INIT, + DBG_LVL_ALL, + "Interrupt call back is called + while suspending the device"); return ;
Hi,
Thanks for doing this, these changes are welcome. However, they should be done slightly differently.
Take one type of checkpatch warning at a time and fix that one over the file, then do a separate patch for the next type of warning. [patch 1/2] Staging: bcm: move curly braces in InterfaceIsr.c [patch 2/2] Staging: bcm: clean up conditions in InterfaceIsr.c
Something like that.
Also the way you've indented the condition is not right. The conditions which are && together should line up like this:
if (((Adapter->bPreparingForLowPowerMode == TRUE) &&
(Adapter->bDoSuspend == TRUE)) ||
psIntfAdapter->bSuspended ||
psIntfAdapter->bPreparingForBusSuspend) {Also the condition has too many parenthesis. Everyone knows how the precedence works in:
if (foo == 3 || bar == 4) {
We don't need to specify:
if ((foo == 3) || (bar == 4)) {Putting extra parenthesis make the code harder to read and has lead to == vs = bugs which would have been caught by gcc:
warning: suggest parentheses around assignment used as truth value [-Wparentheses]
Also can we just leave off the "== TRUE", or is this a case where it can "== TRUE", "== FALSE", and "== FILENOTFOUND"?
Finally, this is not quoted correctly.
drivers/staging/bcm/InterfaceIsr.c static void read_int_callback(struct urb *urb/*, struct pt_regs *regs*/) · line 27
Quoted 2 lines
drivers/staging/bcm/InterfaceIsr.c +2
-0+ "Interrupt call back is called + while suspending the device");
Don't break those string literals up across multiple lines, but if you do then you need to add quotes.
"Interrupt call back is called" ^ "while suspending the device"); ^
regards,
dan carpenter