aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVladimir Kondratiev <qca_vkondrat@qca.qualcomm.com>2013-01-28 11:31:07 -0500
committerJohn W. Linville <linville@tuxdriver.com>2013-01-30 15:07:18 -0500
commitafda8bb50b950b5ee598e3dd0388b06ad1226eed (patch)
treea3fd167f808181d10f91cce0914effcae5f4b5fa
parent7743882d6f59b675809b59b5ac570677c94c426f (diff)
wil6210: checkpatch warnings
Signed-off-by: Vladimir Kondratiev <qca_vkondrat@qca.qualcomm.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/wireless/ath/wil6210/cfg80211.c1
-rw-r--r--drivers/net/wireless/ath/wil6210/interrupt.c1
-rw-r--r--drivers/net/wireless/ath/wil6210/main.c4
-rw-r--r--drivers/net/wireless/ath/wil6210/netdev.c4
-rw-r--r--drivers/net/wireless/ath/wil6210/txrx.c3
-rw-r--r--drivers/net/wireless/ath/wil6210/wmi.c1
6 files changed, 5 insertions, 9 deletions
diff --git a/drivers/net/wireless/ath/wil6210/cfg80211.c b/drivers/net/wireless/ath/wil6210/cfg80211.c
index 4b48f2ee1b68..002851fceb2f 100644
--- a/drivers/net/wireless/ath/wil6210/cfg80211.c
+++ b/drivers/net/wireless/ath/wil6210/cfg80211.c
@@ -204,7 +204,6 @@ static int wil_cfg80211_scan(struct wiphy *wiphy,
204 break; 204 break;
205 default: 205 default:
206 return -EOPNOTSUPP; 206 return -EOPNOTSUPP;
207
208 } 207 }
209 208
210 /* FW don't support scan after connection attempt */ 209 /* FW don't support scan after connection attempt */
diff --git a/drivers/net/wireless/ath/wil6210/interrupt.c b/drivers/net/wireless/ath/wil6210/interrupt.c
index 865c33f1b1ce..dc97e7b2609c 100644
--- a/drivers/net/wireless/ath/wil6210/interrupt.c
+++ b/drivers/net/wireless/ath/wil6210/interrupt.c
@@ -52,7 +52,6 @@
52 52
53static inline void wil_icr_clear(u32 x, void __iomem *addr) 53static inline void wil_icr_clear(u32 x, void __iomem *addr)
54{ 54{
55
56} 55}
57#else /* defined(CONFIG_WIL6210_ISR_COR) */ 56#else /* defined(CONFIG_WIL6210_ISR_COR) */
58/* configure to Write-1-to-Clear mode */ 57/* configure to Write-1-to-Clear mode */
diff --git a/drivers/net/wireless/ath/wil6210/main.c b/drivers/net/wireless/ath/wil6210/main.c
index d160ea84e76a..761c389586d4 100644
--- a/drivers/net/wireless/ath/wil6210/main.c
+++ b/drivers/net/wireless/ath/wil6210/main.c
@@ -80,7 +80,7 @@ static void _wil6210_disconnect(struct wil6210_priv *wil, void *bssid)
80 GFP_KERNEL); 80 GFP_KERNEL);
81 break; 81 break;
82 default: 82 default:
83 ; 83 break;
84 } 84 }
85 85
86 for (i = 0; i < ARRAY_SIZE(wil->vring_tx); i++) 86 for (i = 0; i < ARRAY_SIZE(wil->vring_tx); i++)
@@ -357,7 +357,7 @@ static int __wil_up(struct wil6210_priv *wil)
357 wmi_set_channel(wil, channel->hw_value); 357 wmi_set_channel(wil, channel->hw_value);
358 break; 358 break;
359 default: 359 default:
360 ; 360 break;
361 } 361 }
362 362
363 /* MAC address - pre-requisite for other commands */ 363 /* MAC address - pre-requisite for other commands */
diff --git a/drivers/net/wireless/ath/wil6210/netdev.c b/drivers/net/wireless/ath/wil6210/netdev.c
index 073dc7d39259..8ce2e33dce20 100644
--- a/drivers/net/wireless/ath/wil6210/netdev.c
+++ b/drivers/net/wireless/ath/wil6210/netdev.c
@@ -39,8 +39,8 @@ static const struct net_device_ops wil_netdev_ops = {
39 .ndo_open = wil_open, 39 .ndo_open = wil_open,
40 .ndo_stop = wil_stop, 40 .ndo_stop = wil_stop,
41 .ndo_start_xmit = wil_start_xmit, 41 .ndo_start_xmit = wil_start_xmit,
42 .ndo_set_mac_address = eth_mac_addr, 42 .ndo_set_mac_address = eth_mac_addr,
43 .ndo_validate_addr = eth_validate_addr, 43 .ndo_validate_addr = eth_validate_addr,
44}; 44};
45 45
46void *wil_if_alloc(struct device *dev, void __iomem *csr) 46void *wil_if_alloc(struct device *dev, void __iomem *csr)
diff --git a/drivers/net/wireless/ath/wil6210/txrx.c b/drivers/net/wireless/ath/wil6210/txrx.c
index f0d091313805..48cfa7e13781 100644
--- a/drivers/net/wireless/ath/wil6210/txrx.c
+++ b/drivers/net/wireless/ath/wil6210/txrx.c
@@ -758,8 +758,7 @@ netdev_tx_t wil_start_xmit(struct sk_buff *skb, struct net_device *ndev)
758 case -ENOMEM: 758 case -ENOMEM:
759 return NETDEV_TX_BUSY; 759 return NETDEV_TX_BUSY;
760 default: 760 default:
761 ; /* goto drop; */ 761 break; /* goto drop; */
762 break;
763 } 762 }
764 drop: 763 drop:
765 netif_tx_stop_all_queues(ndev); 764 netif_tx_stop_all_queues(ndev);
diff --git a/drivers/net/wireless/ath/wil6210/wmi.c b/drivers/net/wireless/ath/wil6210/wmi.c
index 91f41a71d243..8178cc0ce650 100644
--- a/drivers/net/wireless/ath/wil6210/wmi.c
+++ b/drivers/net/wireless/ath/wil6210/wmi.c
@@ -188,7 +188,6 @@ static int __wmi_send(struct wil6210_priv *wil, u16 cmdid, void *buf, u16 len)
188 wil_err(wil, "WMI size too large: %d bytes, max is %d\n", 188 wil_err(wil, "WMI size too large: %d bytes, max is %d\n",
189 (int)(sizeof(cmd) + len), r->entry_size); 189 (int)(sizeof(cmd) + len), r->entry_size);
190 return -ERANGE; 190 return -ERANGE;
191
192 } 191 }
193 192
194 might_sleep(); 193 might_sleep();