openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

beeceem: Fix newline issues at opening braces of conditional statements in InterfaceRx.c 

In InterfaceRx.c, opening braces of (if-)conditionals are mostly
dislocated, meaning they are found behind an extra line break after the
conditional statement.  This patch moves the opening braces accordingly
as specified by the official conding style guidelines.

Signed-off-by: Matthias Oefelein <ma.oefelein@arcor.de>
Signed-off-by: Ralph Mueck <linux-kernel@rmueck.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Matthias Oefelein 2014-01-08 23:15:09 +01:00 committed by Greg Kroah-Hartman
parent 7d774a537c
commit b0303a830a
1 changed files with 21 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
drivers/staging/bcm/InterfaceRx.c
View File

@ -19,8 +19,7 @@ GetBulkInRcb(struct bcm_interface_adapter *psIntfAdapter)
UINT index = 0; UINT index = 0;
if ((atomic_read(&psIntfAdapter->uNumRcbUsed) < MAXIMUM_USB_RCB) && if ((atomic_read(&psIntfAdapter->uNumRcbUsed) < MAXIMUM_USB_RCB) &&
(psIntfAdapter->psAdapter->StopAllXaction == false)) (psIntfAdapter->psAdapter->StopAllXaction == false)) {
{
index = atomic_read(&psIntfAdapter->uCurrRcb); index = atomic_read(&psIntfAdapter->uCurrRcb);
pRcb = &psIntfAdapter->asUsbRcb[index]; pRcb = &psIntfAdapter->asUsbRcb[index];
pRcb->bUsed = TRUE; pRcb->bUsed = TRUE;
@ -54,22 +53,17 @@ static void read_bulk_callback(struct urb *urb)
if ((Adapter->device_removed == TRUE) || if ((Adapter->device_removed == TRUE) ||
(TRUE == Adapter->bEndPointHalted) || (TRUE == Adapter->bEndPointHalted) ||
(0 == urb->actual_length)) (0 == urb->actual_length)) {
{
pRcb->bUsed = false; pRcb->bUsed = false;
atomic_dec(&psIntfAdapter->uNumRcbUsed); atomic_dec(&psIntfAdapter->uNumRcbUsed);
return; return;
} }
if (urb->status != STATUS_SUCCESS) if (urb->status != STATUS_SUCCESS) {
{ if (urb->status == -EPIPE) {
if (urb->status == -EPIPE)
{
Adapter->bEndPointHalted = TRUE; Adapter->bEndPointHalted = TRUE;
wake_up(&Adapter->tx_packet_wait_queue); wake_up(&Adapter->tx_packet_wait_queue);
} } else {
else
{
BCM_DEBUG_PRINT(Adapter, DBG_TYPE_RX, RX_DPC, DBG_LVL_ALL, "Rx URB has got cancelled. status :%d", urb->status); BCM_DEBUG_PRINT(Adapter, DBG_TYPE_RX, RX_DPC, DBG_LVL_ALL, "Rx URB has got cancelled. status :%d", urb->status);
} }
pRcb->bUsed = false; pRcb->bUsed = false;
@ -78,22 +72,19 @@ static void read_bulk_callback(struct urb *urb)
return; return;
} }
if (Adapter->bDoSuspend && (Adapter->bPreparingForLowPowerMode)) 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"); 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; return;
} }
BCM_DEBUG_PRINT(Adapter, DBG_TYPE_RX, RX_DPC, DBG_LVL_ALL, "Read back done len %d\n", pLeader->PLength); BCM_DEBUG_PRINT(Adapter, DBG_TYPE_RX, RX_DPC, DBG_LVL_ALL, "Read back done len %d\n", pLeader->PLength);
if (!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, "Leader Length 0");
atomic_dec(&psIntfAdapter->uNumRcbUsed); atomic_dec(&psIntfAdapter->uNumRcbUsed);
return; 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); 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 (MAX_CNTL_PKT_SIZE < pLeader->PLength) {
{
if (netif_msg_rx_err(Adapter)) if (netif_msg_rx_err(Adapter))
pr_info(PFX "%s: corrupted leader length...%d\n", pr_info(PFX "%s: corrupted leader length...%d\n",
Adapter->dev->name, pLeader->PLength); Adapter->dev->name, pLeader->PLength);
@ -103,8 +94,7 @@ static void read_bulk_callback(struct urb *urb)
} }
QueueIndex = SearchVcid(Adapter, pLeader->Vcid); QueueIndex = SearchVcid(Adapter, pLeader->Vcid);
if (QueueIndex < NO_OF_QUEUES) if (QueueIndex < NO_OF_QUEUES) {
{
bHeaderSupressionEnabled = bHeaderSupressionEnabled =
Adapter->PackInfo[QueueIndex].bHeaderSuppressionEnabled; Adapter->PackInfo[QueueIndex].bHeaderSuppressionEnabled;
bHeaderSupressionEnabled = bHeaderSupressionEnabled =
@ -112,16 +102,14 @@ static void read_bulk_callback(struct urb *urb)
} }
skb = dev_alloc_skb(pLeader->PLength + SKB_RESERVE_PHS_BYTES + SKB_RESERVE_ETHERNET_HEADER);//2 //2 for allignment skb = dev_alloc_skb(pLeader->PLength + SKB_RESERVE_PHS_BYTES + SKB_RESERVE_ETHERNET_HEADER);//2 //2 for allignment
if (!skb) if (!skb) {
{
BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "NO SKBUFF!!! Dropping the Packet"); BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "NO SKBUFF!!! Dropping the Packet");
atomic_dec(&psIntfAdapter->uNumRcbUsed); atomic_dec(&psIntfAdapter->uNumRcbUsed);
return; return;
} }
/* If it is a control Packet, then call handle_bcm_packet ()*/ /* If it is a control Packet, then call handle_bcm_packet ()*/
if ((ntohs(pLeader->Vcid) == VCID_CONTROL_PACKET) || if ((ntohs(pLeader->Vcid) == VCID_CONTROL_PACKET) ||
(!(pLeader->Status >= 0x20 && pLeader->Status <= 0x3F))) (!(pLeader->Status >= 0x20 && pLeader->Status <= 0x3F))) {
{
BCM_DEBUG_PRINT(psIntfAdapter->psAdapter, DBG_TYPE_RX, RX_CTRL, DBG_LVL_ALL, "Received control pkt..."); BCM_DEBUG_PRINT(psIntfAdapter->psAdapter, DBG_TYPE_RX, RX_CTRL, DBG_LVL_ALL, "Received control pkt...");
*(PUSHORT)skb->data = pLeader->Status; *(PUSHORT)skb->data = pLeader->Status;
memcpy(skb->data+sizeof(USHORT), urb->transfer_buffer + memcpy(skb->data+sizeof(USHORT), urb->transfer_buffer +
@ -134,9 +122,7 @@ static void read_bulk_callback(struct urb *urb)
atomic_inc(&Adapter->cntrlpktCnt); atomic_inc(&Adapter->cntrlpktCnt);
wake_up(&Adapter->process_rx_cntrlpkt); wake_up(&Adapter->process_rx_cntrlpkt);
} } else {
else
{
/* /*
* Data Packet, Format a proper Ethernet Header * Data Packet, Format a proper Ethernet Header
* and give it to the stack * and give it to the stack
@ -152,15 +138,13 @@ static void read_bulk_callback(struct urb *urb)
Adapter->PackInfo[QueueIndex].uiThisPeriodRxBytes += 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); 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)) if (netif_running(Adapter->dev)) {
{
/* Moving ahead by ETH_HLEN to the data ptr as received from FW */ /* Moving ahead by ETH_HLEN to the data ptr as received from FW */
skb_pull(skb, ETH_HLEN); skb_pull(skb, ETH_HLEN);
PHSReceive(Adapter, pLeader->Vcid, skb, &skb->len, 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); skb_push(skb, ETH_HLEN);
memcpy(skb->data, skb->dev->dev_addr, 6); memcpy(skb->data, skb->dev->dev_addr, 6);
@ -173,9 +157,7 @@ static void read_bulk_callback(struct urb *urb)
skb->protocol = eth_type_trans(skb, Adapter->dev); skb->protocol = eth_type_trans(skb, Adapter->dev);
process_done = netif_rx(skb); process_done = netif_rx(skb);
} } else {
else
{
BCM_DEBUG_PRINT(psIntfAdapter->psAdapter, DBG_TYPE_RX, RX_DATA, DBG_LVL_ALL, "i/f not up hance freeing SKB..."); BCM_DEBUG_PRINT(psIntfAdapter->psAdapter, DBG_TYPE_RX, RX_DATA, DBG_LVL_ALL, "i/f not up hance freeing SKB...");
dev_kfree_skb(skb); dev_kfree_skb(skb);
} }
@ -183,8 +165,7 @@ static void read_bulk_callback(struct urb *urb)
++Adapter->dev->stats.rx_packets; ++Adapter->dev->stats.rx_packets;
Adapter->dev->stats.rx_bytes += pLeader->PLength; Adapter->dev->stats.rx_bytes += pLeader->PLength;
for (uiIndex = 0; uiIndex < MIBS_MAX_HIST_ENTRIES; uiIndex++) for (uiIndex = 0; uiIndex < MIBS_MAX_HIST_ENTRIES; uiIndex++) {
{
if ((pLeader->PLength <= MIBS_PKTSIZEHIST_RANGE*(uiIndex+1)) && if ((pLeader->PLength <= MIBS_PKTSIZEHIST_RANGE*(uiIndex+1)) &&
(pLeader->PLength > MIBS_PKTSIZEHIST_RANGE*(uiIndex))) (pLeader->PLength > MIBS_PKTSIZEHIST_RANGE*(uiIndex)))
Adapter->aRxPktSizeHist[uiIndex]++; Adapter->aRxPktSizeHist[uiIndex]++;
@ -205,15 +186,12 @@ static int ReceiveRcb(struct bcm_interface_adapter *psIntfAdapter, struct bcm_us
if (false == psIntfAdapter->psAdapter->device_removed && if (false == psIntfAdapter->psAdapter->device_removed &&
false == psIntfAdapter->psAdapter->bEndPointHalted && false == psIntfAdapter->psAdapter->bEndPointHalted &&
false == psIntfAdapter->bSuspended && false == psIntfAdapter->bSuspended &&
false == psIntfAdapter->bPreparingForBusSuspend) false == psIntfAdapter->bPreparingForBusSuspend) {
{
retval = usb_submit_urb(urb, GFP_ATOMIC); retval = usb_submit_urb(urb, GFP_ATOMIC);
if (retval) if (retval) {
{
BCM_DEBUG_PRINT(psIntfAdapter->psAdapter, DBG_TYPE_RX, RX_DPC, DBG_LVL_ALL, "failed submitting read urb, error %d", 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 this return value is because of pipe halt. need to clear this.
if (retval == -EPIPE) if (retval == -EPIPE) {
{
psIntfAdapter->psAdapter->bEndPointHalted = TRUE; psIntfAdapter->psAdapter->bEndPointHalted = TRUE;
wake_up(&psIntfAdapter->psAdapter->tx_packet_wait_queue); wake_up(&psIntfAdapter->psAdapter->tx_packet_wait_queue);
} }
@ -244,11 +222,9 @@ bool InterfaceRx(struct bcm_interface_adapter *psIntfAdapter)
// RxDescCount = psIntfAdapter->psAdapter->CurrNumRecvDescs - // RxDescCount = psIntfAdapter->psAdapter->CurrNumRecvDescs -
// psIntfAdapter->psAdapter->PrevNumRecvDescs; // psIntfAdapter->psAdapter->PrevNumRecvDescs;
while (RxDescCount) while (RxDescCount) {
{
pRcb = GetBulkInRcb(psIntfAdapter); pRcb = GetBulkInRcb(psIntfAdapter);
if (pRcb == NULL) if (pRcb == NULL) {
{
BCM_DEBUG_PRINT(psIntfAdapter->psAdapter, DBG_TYPE_PRINTK, 0, 0, "Unable to get Rcb pointer"); BCM_DEBUG_PRINT(psIntfAdapter->psAdapter, DBG_TYPE_PRINTK, 0, 0, "Unable to get Rcb pointer");
return false; return false;
} }