fixed all the errors found by checkpatch.pl
Signed-off-by: Gokulnath A <gokulnath.avanashilin...@in.bosch.com>
---
drivers/staging/bcm/InterfaceIsr.c | 107 ++++++++++++++++---------------------
1 file changed, 45 insertions(+), 62 deletions(-)
diff --git a/drivers/staging/bcm/InterfaceIsr.c
b/drivers/staging/bcm/InterfaceIsr.c
index 7b39f4f..6a59949 100644
--- a/drivers/staging/bcm/InterfaceIsr.c
+++ b/drivers/staging/bcm/InterfaceIsr.c
@@ -11,101 +11,89 @@ 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,
DBG_LVL_ALL, "Device has Got Removed.");
return ;
}
- if(((Adapter->bPreparingForLowPowerMode == TRUE) &&
(Adapter->bDoSuspend == TRUE)) ||
+ 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");
+ 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);
switch (status) {
- /* success */
- case STATUS_SUCCESS:
- if ( urb->actual_length )
- {
+ 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] & 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",
+ 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=
+ 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",
+ 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;
}
- 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);
+ 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);
+ 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,9 +105,8 @@ static void read_int_callback(struct urb *urb/*, struct
pt_regs *regs*/)
int CreateInterruptUrb(struct bcm_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 =
@@ -137,7 +124,7 @@ int CreateInterruptUrb(struct bcm_interface_adapter
*psIntfAdapter)
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,18 +134,15 @@ INT StartInterruptUrb(struct bcm_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)
- {
+ 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)
- {
+ 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);
}
@@ -166,4 +150,3 @@ INT StartInterruptUrb(struct bcm_interface_adapter
*psIntfAdapter)
}
return status;
}
-
--
1.8.1.2
_______________________________________________
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
