diff options
author | Jelena Bjelja <jelena.bjelja.ing@gmail.com> | 2014-03-19 14:46:11 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-03-19 16:52:06 -0400 |
commit | f1e2fb65c363634f16472f57b6bbca6d10ae77e5 (patch) | |
tree | d5f9a8a7fd367bc63ea2664b2c1e7ad58335d86a | |
parent | 0d0560e25b4a92f7eedef4deb13ec4ab954b7c28 (diff) |
staging: wlags49_h2: Delete unnecessary braces
Fix the following checkpatch.pl warnings in wl_netdev.c:
WARNING: braces {} are not necessary for single statement blocks
Signed-off-by: Jelena Bjelja <jelena.bjelja.ing@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/staging/wlags49_h2/wl_netdev.c | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/drivers/staging/wlags49_h2/wl_netdev.c b/drivers/staging/wlags49_h2/wl_netdev.c index 9b6fc4169308..77e4be21e44b 100644 --- a/drivers/staging/wlags49_h2/wl_netdev.c +++ b/drivers/staging/wlags49_h2/wl_netdev.c | |||
@@ -225,17 +225,15 @@ struct net_device_stats *wl_stats(struct net_device *dev) | |||
225 | #ifdef USE_WDS | 225 | #ifdef USE_WDS |
226 | 226 | ||
227 | for (count = 0; count < NUM_WDS_PORTS; count++) { | 227 | for (count = 0; count < NUM_WDS_PORTS; count++) { |
228 | if (dev == lp->wds_port[count].dev) { | 228 | if (dev == lp->wds_port[count].dev) |
229 | pStats = &(lp->wds_port[count].stats); | 229 | pStats = &(lp->wds_port[count].stats); |
230 | } | ||
231 | } | 230 | } |
232 | 231 | ||
233 | #endif /* USE_WDS */ | 232 | #endif /* USE_WDS */ |
234 | 233 | ||
235 | /* If pStats is still NULL, then the device is not a WDS port */ | 234 | /* If pStats is still NULL, then the device is not a WDS port */ |
236 | if (pStats == NULL) { | 235 | if (pStats == NULL) |
237 | pStats = &(lp->stats); | 236 | pStats = &(lp->stats); |
238 | } | ||
239 | 237 | ||
240 | wl_unlock(lp, &flags); | 238 | wl_unlock(lp, &flags); |
241 | 239 | ||
@@ -578,9 +576,8 @@ void wl_tx_timeout(struct net_device *dev) | |||
578 | #endif /* USE_WDS */ | 576 | #endif /* USE_WDS */ |
579 | 577 | ||
580 | /* If pStats is still NULL, then the device is not a WDS port */ | 578 | /* If pStats is still NULL, then the device is not a WDS port */ |
581 | if (pStats == NULL) { | 579 | if (pStats == NULL) |
582 | pStats = &(lp->stats); | 580 | pStats = &(lp->stats); |
583 | } | ||
584 | 581 | ||
585 | /* Accumulate the timeout error */ | 582 | /* Accumulate the timeout error */ |
586 | pStats->tx_errors++; | 583 | pStats->tx_errors++; |
@@ -663,9 +660,8 @@ int wl_send(struct wl_private *lp) | |||
663 | } | 660 | } |
664 | } | 661 | } |
665 | 662 | ||
666 | if (lp->txF.skb == NULL) { | 663 | if (lp->txF.skb == NULL) |
667 | return FALSE; | 664 | return FALSE; |
668 | } | ||
669 | 665 | ||
670 | /* If the device has resources (FIDs) available, then Tx the packet */ | 666 | /* If the device has resources (FIDs) available, then Tx the packet */ |
671 | /* Format the TxRequest and send it to the adapter */ | 667 | /* Format the TxRequest and send it to the adapter */ |
@@ -926,9 +922,8 @@ int wl_rx(struct net_device *dev) | |||
926 | DBG_ERROR(DbgInfo, | 922 | DBG_ERROR(DbgInfo, |
927 | "Rx request to card FAILED\n"); | 923 | "Rx request to card FAILED\n"); |
928 | 924 | ||
929 | if (port == 0) { | 925 | if (port == 0) |
930 | lp->stats.rx_dropped++; | 926 | lp->stats.rx_dropped++; |
931 | } | ||
932 | #ifdef USE_WDS | 927 | #ifdef USE_WDS |
933 | else { | 928 | else { |
934 | lp->wds_port[port - | 929 | lp->wds_port[port - |
@@ -942,9 +937,8 @@ int wl_rx(struct net_device *dev) | |||
942 | } else { | 937 | } else { |
943 | DBG_ERROR(DbgInfo, "Could not alloc skb\n"); | 938 | DBG_ERROR(DbgInfo, "Could not alloc skb\n"); |
944 | 939 | ||
945 | if (port == 0) { | 940 | if (port == 0) |
946 | lp->stats.rx_dropped++; | 941 | lp->stats.rx_dropped++; |
947 | } | ||
948 | #ifdef USE_WDS | 942 | #ifdef USE_WDS |
949 | else { | 943 | else { |
950 | lp->wds_port[port - | 944 | lp->wds_port[port - |
@@ -1657,9 +1651,8 @@ void wl_wds_netif_carrier_on(struct wl_private *lp) | |||
1657 | 1651 | ||
1658 | if (lp != NULL) { | 1652 | if (lp != NULL) { |
1659 | for (count = 0; count < NUM_WDS_PORTS; count++) { | 1653 | for (count = 0; count < NUM_WDS_PORTS; count++) { |
1660 | if (lp->wds_port[count].is_registered) { | 1654 | if (lp->wds_port[count].is_registered) |
1661 | netif_carrier_on(lp->wds_port[count].dev); | 1655 | netif_carrier_on(lp->wds_port[count].dev); |
1662 | } | ||
1663 | } | 1656 | } |
1664 | } | 1657 | } |
1665 | } /* wl_wds_netif_carrier_on */ | 1658 | } /* wl_wds_netif_carrier_on */ |
@@ -1936,9 +1929,8 @@ int wl_rx_dma(struct net_device *dev) | |||
1936 | DBG_ERROR(DbgInfo, | 1929 | DBG_ERROR(DbgInfo, |
1937 | "Could not alloc skb\n"); | 1930 | "Could not alloc skb\n"); |
1938 | 1931 | ||
1939 | if (port == 0) { | 1932 | if (port == 0) |
1940 | lp->stats.rx_dropped++; | 1933 | lp->stats.rx_dropped++; |
1941 | } | ||
1942 | #ifdef USE_WDS | 1934 | #ifdef USE_WDS |
1943 | else { | 1935 | else { |
1944 | lp->wds_port[port - | 1936 | lp->wds_port[port - |