This patch fixes the following checkpatch.pl issues in wl_netdev.c:
ERROR: space required before the open parenthesis '('
Signed-off-by: Jelena Bjelja <jelena.bjelja.ing@xxxxxxxxx>
---
drivers/staging/wlags49_h2/wl_netdev.c | 170 ++++++++++++++++----------------
1 file changed, 85 insertions(+), 85 deletions(-)
diff --git a/drivers/staging/wlags49_h2/wl_netdev.c b/drivers/staging/wlags49_h2/wl_netdev.c
index dc38721..6ab0ff3 100644
--- a/drivers/staging/wlags49_h2/wl_netdev.c
+++ b/drivers/staging/wlags49_h2/wl_netdev.c
@@ -240,7 +240,7 @@ struct net_device_stats *wl_stats(struct net_device *dev)
wl_lock(lp, &flags);
#ifdef USE_RTS
- if(lp->useRTS == 1) {
+ if (lp->useRTS == 1) {
wl_unlock(lp, &flags);
return NULL;
}
@@ -249,8 +249,8 @@ struct net_device_stats *wl_stats(struct net_device *dev)
/* Return the statistics for the appropriate device */
#ifdef USE_WDS
- for(count = 0; count < NUM_WDS_PORTS; count++) {
- if(dev == lp->wds_port[count].dev) {
+ for (count = 0; count < NUM_WDS_PORTS; count++) {
+ if (dev == lp->wds_port[count].dev) {
pStats = &(lp->wds_port[count].stats);
}
}
@@ -258,7 +258,7 @@ struct net_device_stats *wl_stats(struct net_device *dev)
#endif /* USE_WDS */
/* If pStats is still NULL, then the device is not a WDS port */
- if(pStats == NULL) {
+ if (pStats == NULL) {
pStats = &(lp->stats);
}
@@ -295,7 +295,7 @@ int wl_open(struct net_device *dev)
wl_lock(lp, &flags);
#ifdef USE_RTS
- if(lp->useRTS == 1) {
+ if (lp->useRTS == 1) {
DBG_TRACE(DbgInfo, "Skipping device open, in RTS mode\n");
wl_unlock(lp, &flags);
return -EIO;
@@ -306,11 +306,11 @@ int wl_open(struct net_device *dev)
parse_config(dev);
#endif
- if(lp->portState == WVLAN_PORT_STATE_DISABLED) {
+ if (lp->portState == WVLAN_PORT_STATE_DISABLED) {
DBG_TRACE(DbgInfo, "Enabling Port 0\n");
status = wl_enable(lp);
- if(status != HCF_SUCCESS) {
+ if (status != HCF_SUCCESS) {
DBG_TRACE(DbgInfo, "Enable port 0 failed: 0x%x\n", status);
}
}
@@ -330,7 +330,7 @@ int wl_open(struct net_device *dev)
wl_unlock(lp, &flags);
wl_lock(lp, &flags);
- if(status != HCF_SUCCESS) {
+ if (status != HCF_SUCCESS) {
// Unsuccessful, try reset of the card to recover
status = wl_reset(dev);
}
@@ -339,7 +339,7 @@ int wl_open(struct net_device *dev)
wl_unlock(lp, &flags);
wl_lock(lp, &flags);
- if(status == HCF_SUCCESS) {
+ if (status == HCF_SUCCESS) {
netif_carrier_on(dev);
WL_WDS_NETIF_CARRIER_ON(lp);
@@ -404,7 +404,7 @@ int wl_close(struct net_device *dev)
lp->is_handling_int = WL_NOT_HANDLING_INT; // Stop handling interrupts
#ifdef USE_RTS
- if(lp->useRTS == 1) {
+ if (lp->useRTS == 1) {
DBG_TRACE(DbgInfo, "Skipping device close, in RTS mode\n");
wl_unlock(lp, &flags);
return -EIO;
@@ -479,9 +479,9 @@ int wl_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
wl_act_int_off(lp);
#ifdef USE_RTS
- if(lp->useRTS == 1) {
+ if (lp->useRTS == 1) {
/* Handle any RTS IOCTL here */
- if(cmd == WL_IOCTL_RTS) {
+ if (cmd == WL_IOCTL_RTS) {
DBG_TRACE(DbgInfo, "IOCTL: WL_IOCTL_RTS\n");
ret = wvlan_rts((struct rtsreq *)rq, dev->base_addr);
} else {
@@ -494,12 +494,12 @@ int wl_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
#endif /* USE_RTS */
/* Only handle UIL IOCTL requests when the UIL has the system blocked. */
- if(!((lp->flags & WVLAN2_UIL_BUSY) && (cmd != WVLAN2_IOCTL_UIL))) {
+ if (!((lp->flags & WVLAN2_UIL_BUSY) && (cmd != WVLAN2_IOCTL_UIL))) {
#ifdef USE_UIL
struct uilreq *urq = (struct uilreq *)rq;
#endif /* USE_UIL */
- switch(cmd) {
+ switch (cmd) {
// ================== Private IOCTLs (up to 16) ==================
#ifdef USE_UIL
case WVLAN2_IOCTL_UIL:
@@ -573,7 +573,7 @@ void wl_tx_timeout(struct net_device *dev)
wl_lock(lp, &flags);
#ifdef USE_RTS
- if(lp->useRTS == 1) {
+ if (lp->useRTS == 1) {
DBG_TRACE(DbgInfo, "Skipping tx_timeout handler, in RTS mode\n");
wl_unlock(lp, &flags);
return;
@@ -584,8 +584,8 @@ void wl_tx_timeout(struct net_device *dev)
is for */
#ifdef USE_WDS
- for(count = 0; count < NUM_WDS_PORTS; count++) {
- if(dev == lp->wds_port[count].dev) {
+ for (count = 0; count < NUM_WDS_PORTS; count++) {
+ if (dev == lp->wds_port[count].dev) {
pStats = &(lp->wds_port[count].stats);
/* Break the loop so that we can use the counter to access WDS
@@ -597,7 +597,7 @@ void wl_tx_timeout(struct net_device *dev)
#endif /* USE_WDS */
/* If pStats is still NULL, then the device is not a WDS port */
- if(pStats == NULL) {
+ if (pStats == NULL) {
pStats = &(lp->stats);
}
@@ -636,27 +636,27 @@ int wl_send(struct wl_private *lp)
int len;
/*------------------------------------------------------------------------*/
- if(lp == NULL) {
+ if (lp == NULL) {
DBG_ERROR(DbgInfo, "Private adapter struct is NULL\n");
return FALSE;
}
- if(lp->dev == NULL) {
+ if (lp->dev == NULL) {
DBG_ERROR(DbgInfo, "net_device struct in wl_private is NULL\n");
return FALSE;
}
/* Check for the availability of FIDs; if none are available, don't take any
frames off the txQ */
- if(lp->hcfCtx.IFB_RscInd == 0) {
+ if (lp->hcfCtx.IFB_RscInd == 0) {
return FALSE;
}
/* Reclaim the TxQ Elements and place them back on the free queue */
- if(!list_empty(&(lp->txQ[0]))) {
+ if (!list_empty(&(lp->txQ[0]))) {
element = lp->txQ[0].next;
txF = (WVLAN_LFRAME *)list_entry(element, WVLAN_LFRAME, node);
- if(txF != NULL) {
+ if (txF != NULL) {
lp->txF.skb = txF->frame.skb;
lp->txF.port = txF->frame.port;
@@ -668,8 +668,8 @@ int wl_send(struct wl_private *lp)
lp->txQ_count--;
- if(lp->txQ_count < TX_Q_LOW_WATER_MARK) {
- if(lp->netif_queue_on == FALSE) {
+ if (lp->txQ_count < TX_Q_LOW_WATER_MARK) {
+ if (lp->netif_queue_on == FALSE) {
DBG_TX(DbgInfo, "Kickstarting Q: %d\n", lp->txQ_count);
netif_wake_queue(lp->dev);
WL_WDS_NETIF_WAKE_QUEUE(lp);
@@ -679,7 +679,7 @@ int wl_send(struct wl_private *lp)
}
}
- if(lp->txF.skb == NULL) {
+ if (lp->txF.skb == NULL) {
return FALSE;
}
@@ -694,12 +694,12 @@ int wl_send(struct wl_private *lp)
status = hcf_send_msg(&(lp->hcfCtx), desc, lp->txF.port);
- if(status == HCF_SUCCESS) {
+ if (status == HCF_SUCCESS) {
lp->dev->trans_start = jiffies;
DBG_TX(DbgInfo, "Transmit...\n");
- if(lp->txF.port == HCF_PORT_0) {
+ if (lp->txF.port == HCF_PORT_0) {
lp->stats.tx_packets++;
lp->stats.tx_bytes += lp->txF.skb->len;
}
@@ -755,7 +755,7 @@ int wl_tx(struct sk_buff *skb, struct net_device *dev, int port)
/* Grab the spinlock */
wl_lock(lp, &flags);
- if(lp->flags & WVLAN2_UIL_BUSY) {
+ if (lp->flags & WVLAN2_UIL_BUSY) {
DBG_WARNING(DbgInfo, "UIL has device blocked\n");
/* Start dropping packets here??? */
wl_unlock(lp, &flags);
@@ -763,18 +763,18 @@ int wl_tx(struct sk_buff *skb, struct net_device *dev, int port)
}
#ifdef USE_RTS
- if(lp->useRTS == 1) {
+ if (lp->useRTS == 1) {
DBG_PRINT("RTS: we're getting a Tx...\n");
wl_unlock(lp, &flags);
return 1;
}
#endif /* USE_RTS */
- if(!lp->use_dma) {
+ if (!lp->use_dma) {
/* Get an element from the queue */
element = lp->txFree.next;
txF = (WVLAN_LFRAME *)list_entry(element, WVLAN_LFRAME, node);
- if(txF == NULL) {
+ if (txF == NULL) {
DBG_ERROR(DbgInfo, "Problem with list_entry\n");
wl_unlock(lp, &flags);
return 1;
@@ -787,9 +787,9 @@ int wl_tx(struct sk_buff *skb, struct net_device *dev, int port)
list_move(&(txF->node), &(lp->txQ[0]));
lp->txQ_count++;
- if(lp->txQ_count >= DEFAULT_NUM_TX_FRAMES) {
+ if (lp->txQ_count >= DEFAULT_NUM_TX_FRAMES) {
DBG_TX(DbgInfo, "Q Full: %d\n", lp->txQ_count);
- if(lp->netif_queue_on == TRUE) {
+ if (lp->netif_queue_on == TRUE) {
netif_stop_queue(lp->dev);
WL_WDS_NETIF_STOP_QUEUE(lp);
lp->netif_queue_on = FALSE;
@@ -800,7 +800,7 @@ int wl_tx(struct sk_buff *skb, struct net_device *dev, int port)
/* Send the data to the hardware using the appropriate method */
#ifdef ENABLE_DMA
- if(lp->use_dma) {
+ if (lp->use_dma) {
wl_send_dma(lp, skb, port);
}
else
@@ -846,10 +846,10 @@ int wl_rx(struct net_device *dev)
DBG_PARAM(DbgInfo, "dev", "%s (0x%p)", dev->name, dev);
- if(!(lp->flags & WVLAN2_UIL_BUSY)) {
+ if (!(lp->flags & WVLAN2_UIL_BUSY)) {
#ifdef USE_RTS
- if(lp->useRTS == 1) {
+ if (lp->useRTS == 1) {
DBG_PRINT("RTS: We're getting an Rx...\n");
return -EIO;
}
@@ -860,7 +860,7 @@ int wl_rx(struct net_device *dev)
(lp->lookAheadBuf[HFS_STAT + 1] << 8));
/* Make sure the frame isn't bad */
- if((hfs_stat & HFS_STAT_ERR) != HCF_SUCCESS) {
+ if ((hfs_stat & HFS_STAT_ERR) != HCF_SUCCESS) {
DBG_WARNING(DbgInfo,
"HFS_STAT_ERROR (0x%x) in Rx Packet\n",
lp->lookAheadBuf[HFS_STAT]);
@@ -876,7 +876,7 @@ int wl_rx(struct net_device *dev)
skb = ALLOC_SKB(pktlen);
if (skb != NULL) {
/* Set the netdev based on the port */
- switch(port) {
+ switch (port) {
#ifdef USE_WDS
case 1:
case 2:
@@ -906,10 +906,10 @@ int wl_rx(struct net_device *dev)
GET_PACKET(skb->dev, skb, pktlen);
- if(status == HCF_SUCCESS) {
+ if (status == HCF_SUCCESS) {
netif_rx(skb);
- if(port == 0) {
+ if (port == 0) {
lp->stats.rx_packets++;
lp->stats.rx_bytes += pktlen;
}
@@ -925,7 +925,7 @@ int wl_rx(struct net_device *dev)
#ifdef WIRELESS_EXT
#ifdef WIRELESS_SPY
- if(lp->spydata.spy_number > 0) {
+ if (lp->spydata.spy_number > 0) {
char *srcaddr = skb->mac.raw + MAC_ADDR_SIZE;
wl_spy_gather(dev, srcaddr);
@@ -935,7 +935,7 @@ int wl_rx(struct net_device *dev)
} else {
DBG_ERROR(DbgInfo, "Rx request to card FAILED\n");
- if(port == 0) {
+ if (port == 0) {
lp->stats.rx_dropped++;
}
#ifdef USE_WDS
@@ -950,7 +950,7 @@ int wl_rx(struct net_device *dev)
} else {
DBG_ERROR(DbgInfo, "Could not alloc skb\n");
- if(port == 0) {
+ if (port == 0) {
lp->stats.rx_dropped++;
}
#ifdef USE_WDS
@@ -998,11 +998,11 @@ void wl_multicast(struct net_device *dev)
DBG_PARAM(DbgInfo, "dev", "%s (0x%p)", dev->name, dev);
- if(!wl_adapter_is_open(dev))
+ if (!wl_adapter_is_open(dev))
return;
#if DBG
- if(DBG_FLAGS(DbgInfo) & DBG_PARAM_ON) {
+ if (DBG_FLAGS(DbgInfo) & DBG_PARAM_ON) {
DBG_PRINT(" flags: %s%s%s\n",
(dev->flags & IFF_PROMISC) ? "Promiscuous " : "",
(dev->flags & IFF_MULTICAST) ? "Multicast " : "",
@@ -1015,10 +1015,10 @@ void wl_multicast(struct net_device *dev)
}
#endif /* DBG */
- if(!(lp->flags & WVLAN2_UIL_BUSY)) {
+ if (!(lp->flags & WVLAN2_UIL_BUSY)) {
#ifdef USE_RTS
- if(lp->useRTS == 1) {
+ if (lp->useRTS == 1) {
DBG_TRACE(DbgInfo, "Skipping multicast, in RTS mode\n");
return;
}
@@ -1028,7 +1028,7 @@ void wl_multicast(struct net_device *dev)
wl_act_int_off(lp);
if (CNV_INT_TO_LITTLE(lp->hcfCtx.IFB_FWIdentity.comp_id) == COMP_ID_FW_STA) {
- if(dev->flags & IFF_PROMISC) {
+ if (dev->flags & IFF_PROMISC) {
/* Enable promiscuous mode */
lp->ltvRecord.len = 2;
lp->ltvRecord.typ = CFG_PROMISCUOUS_MODE;
@@ -1160,7 +1160,7 @@ struct net_device * wl_device_alloc(void)
/* Check MTU */
- if(dev->mtu > MTU_MAX)
+ if (dev->mtu > MTU_MAX)
{
DBG_WARNING(DbgInfo, "%s: MTU set too high, limiting to %d.\n",
dev->name, MTU_MAX);
@@ -1424,7 +1424,7 @@ void wl_wds_device_alloc(struct wl_private *lp)
/* WDS support requires additional net_device structs to be allocated,
so that user space apps can use these virtual devices to specify the
port on which to Tx/Rx */
- for(count = 0; count < NUM_WDS_PORTS; count++) {
+ for (count = 0; count < NUM_WDS_PORTS; count++) {
struct net_device *dev_wds = NULL;
dev_wds = kzalloc(sizeof(struct net_device), GFP_KERNEL);
@@ -1484,13 +1484,13 @@ void wl_wds_device_dealloc(struct wl_private *lp)
{
int count;
- for(count = 0; count < NUM_WDS_PORTS; count++) {
+ for (count = 0; count < NUM_WDS_PORTS; count++) {
struct net_device *dev_wds = NULL;
dev_wds = lp->wds_port[count].dev;
- if(dev_wds != NULL) {
- if(dev_wds->flags & IFF_UP) {
+ if (dev_wds != NULL) {
+ if (dev_wds->flags & IFF_UP) {
dev_close(dev_wds);
dev_wds->flags &= ~(IFF_UP | IFF_RUNNING);
}
@@ -1525,9 +1525,9 @@ void wl_wds_netif_start_queue(struct wl_private *lp)
int count;
/*------------------------------------------------------------------------*/
- if(lp != NULL) {
- for(count = 0; count < NUM_WDS_PORTS; count++) {
- if(lp->wds_port[count].is_registered &&
+ if (lp != NULL) {
+ for (count = 0; count < NUM_WDS_PORTS; count++) {
+ if (lp->wds_port[count].is_registered &&
lp->wds_port[count].netif_queue_on == FALSE) {
netif_start_queue(lp->wds_port[count].dev);
lp->wds_port[count].netif_queue_on = TRUE;
@@ -1560,9 +1560,9 @@ void wl_wds_netif_stop_queue(struct wl_private *lp)
int count;
/*------------------------------------------------------------------------*/
- if(lp != NULL) {
- for(count = 0; count < NUM_WDS_PORTS; count++) {
- if(lp->wds_port[count].is_registered &&
+ if (lp != NULL) {
+ for (count = 0; count < NUM_WDS_PORTS; count++) {
+ if (lp->wds_port[count].is_registered &&
lp->wds_port[count].netif_queue_on == TRUE) {
netif_stop_queue(lp->wds_port[count].dev);
lp->wds_port[count].netif_queue_on = FALSE;
@@ -1595,9 +1595,9 @@ void wl_wds_netif_wake_queue(struct wl_private *lp)
int count;
/*------------------------------------------------------------------------*/
- if(lp != NULL) {
- for(count = 0; count < NUM_WDS_PORTS; count++) {
- if(lp->wds_port[count].is_registered &&
+ if (lp != NULL) {
+ for (count = 0; count < NUM_WDS_PORTS; count++) {
+ if (lp->wds_port[count].is_registered &&
lp->wds_port[count].netif_queue_on == FALSE) {
netif_wake_queue(lp->wds_port[count].dev);
lp->wds_port[count].netif_queue_on = TRUE;
@@ -1630,9 +1630,9 @@ void wl_wds_netif_carrier_on(struct wl_private *lp)
int count;
/*------------------------------------------------------------------------*/
- if(lp != NULL) {
- for(count = 0; count < NUM_WDS_PORTS; count++) {
- if(lp->wds_port[count].is_registered) {
+ if (lp != NULL) {
+ for (count = 0; count < NUM_WDS_PORTS; count++) {
+ if (lp->wds_port[count].is_registered) {
netif_carrier_on(lp->wds_port[count].dev);
}
}
@@ -1662,9 +1662,9 @@ void wl_wds_netif_carrier_off(struct wl_private *lp)
{
int count;
- if(lp != NULL) {
- for(count = 0; count < NUM_WDS_PORTS; count++) {
- if(lp->wds_port[count].is_registered)
+ if (lp != NULL) {
+ for (count = 0; count < NUM_WDS_PORTS; count++) {
+ if (lp->wds_port[count].is_registered)
netif_carrier_off(lp->wds_port[count].dev);
}
}
@@ -1702,19 +1702,19 @@ int wl_send_dma(struct wl_private *lp, struct sk_buff *skb, int port)
DESC_STRCT *desc_next = NULL;
/*------------------------------------------------------------------------*/
- if(lp == NULL) {
+ if (lp == NULL) {
DBG_ERROR(DbgInfo, "Private adapter struct is NULL\n");
return FALSE;
}
- if(lp->dev == NULL) {
+ if (lp->dev == NULL) {
DBG_ERROR(DbgInfo, "net_device struct in wl_private is NULL\n");
return FALSE;
}
/* AGAIN, ALL THE QUEUEING DONE HERE IN I/O MODE IS NOT PERFORMED */
- if(skb == NULL) {
+ if (skb == NULL) {
DBG_WARNING (DbgInfo, "Nothing to send.\n");
return FALSE;
}
@@ -1724,8 +1724,8 @@ int wl_send_dma(struct wl_private *lp, struct sk_buff *skb, int port)
/* Get a free descriptor */
desc = wl_pci_dma_get_tx_packet(lp);
- if(desc == NULL) {
- if(lp->netif_queue_on == TRUE) {
+ if (desc == NULL) {
+ if (lp->netif_queue_on == TRUE) {
netif_stop_queue(lp->dev);
WL_WDS_NETIF_STOP_QUEUE(lp);
lp->netif_queue_on = FALSE;
@@ -1740,7 +1740,7 @@ int wl_send_dma(struct wl_private *lp, struct sk_buff *skb, int port)
desc_next = desc->next_desc_addr;
- if(desc_next->buf_addr == NULL) {
+ if (desc_next->buf_addr == NULL) {
DBG_ERROR(DbgInfo, "DMA descriptor buf_addr is NULL\n");
return FALSE;
}
@@ -1792,25 +1792,25 @@ int wl_rx_dma(struct net_device *dev)
DBG_PARAM(DbgInfo, "dev", "%s (0x%p)", dev->name, dev);
- if(((lp = dev->priv) != NULL) &&
+ if (((lp = dev->priv) != NULL) &&
!(lp->flags & WVLAN2_UIL_BUSY)) {
#ifdef USE_RTS
- if(lp->useRTS == 1) {
+ if (lp->useRTS == 1) {
DBG_PRINT("RTS: We're getting an Rx...\n");
return -EIO;
}
#endif /* USE_RTS */
- //if(lp->dma.status == 0)
+ //if (lp->dma.status == 0)
//{
desc = hcf_dma_rx_get(&(lp->hcfCtx));
- if(desc != NULL)
+ if (desc != NULL)
{
/* Check and see if we rcvd. a WMP frame */
/*
- if(((*(hcf_8 *)&desc->buf_addr[HFS_STAT]) &
+ if (((*(hcf_8 *)&desc->buf_addr[HFS_STAT]) &
(HFS_STAT_MSG_TYPE | HFS_STAT_ERR)) == HFS_STAT_WMP_MSG)
{
DBG_TRACE(DbgInfo, "Got a WMP frame\n");
@@ -1830,7 +1830,7 @@ int wl_rx_dma(struct net_device *dev)
desc_next = desc->next_desc_addr;
/* Make sure the buffer isn't empty */
- if(GET_BUF_CNT(desc) == 0) {
+ if (GET_BUF_CNT(desc) == 0) {
DBG_WARNING(DbgInfo, "Buffer is empty!\n");
/* Give the descriptor back to the HCF */
@@ -1842,7 +1842,7 @@ int wl_rx_dma(struct net_device *dev)
hfs_stat = (hcf_16)(desc->buf_addr[HFS_STAT/2]);
/* Make sure the frame isn't bad */
- if((hfs_stat & HFS_STAT_ERR) != HCF_SUCCESS)
+ if ((hfs_stat & HFS_STAT_ERR) != HCF_SUCCESS)
{
DBG_WARNING(DbgInfo, "HFS_STAT_ERROR (0x%x) in Rx Packet\n",
desc->buf_addr[HFS_STAT/2]);
@@ -1860,7 +1860,7 @@ int wl_rx_dma(struct net_device *dev)
if (pktlen != 0) {
skb = ALLOC_SKB(pktlen);
if (skb != NULL) {
- switch(port) {
+ switch (port) {
#ifdef USE_WDS
case 1:
case 2:
@@ -1885,7 +1885,7 @@ int wl_rx_dma(struct net_device *dev)
netif_rx(skb);
- if(port == 0) {
+ if (port == 0) {
lp->stats.rx_packets++;
lp->stats.rx_bytes += pktlen;
}
@@ -1902,7 +1902,7 @@ int wl_rx_dma(struct net_device *dev)
} else {
DBG_ERROR(DbgInfo, "Could not alloc skb\n");
- if(port == 0)
+ if (port == 0)
{
lp->stats.rx_dropped++;
}
--
1.7.9.5
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
