aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/rtl818x
diff options
context:
space:
mode:
authorAndrea Merello <andrea.merello@gmail.com>2014-05-31 12:29:46 -0400
committerJohn W. Linville <linville@tuxdriver.com>2014-06-19 15:49:12 -0400
commitafbedbf7dfc0ebff0ea3280530fe0609fd307486 (patch)
treeb9e8d346cff09f8fe7819653b62bb06a88f1b999 /drivers/net/wireless/rtl818x
parent69253b6108102834c7cac826d4c34a0414b83a3e (diff)
rtl818x_pci: make RSSI code more readable
remove the if-else chains and use switch-case to make code more readable and avoiding long lines that broke in several lines Signed-off-by: Andrea Merello <andrea.merello@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/rtl818x')
-rw-r--r--drivers/net/wireless/rtl818x/rtl8180/dev.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/drivers/net/wireless/rtl818x/rtl8180/dev.c b/drivers/net/wireless/rtl818x/rtl8180/dev.c
index 2c1c02bafa10..c2dd5e636d28 100644
--- a/drivers/net/wireless/rtl818x/rtl8180/dev.c
+++ b/drivers/net/wireless/rtl818x/rtl8180/dev.c
@@ -209,7 +209,7 @@ static void rtl8180_handle_rx(struct ieee80211_hw *dev)
209 struct rtl8180_priv *priv = dev->priv; 209 struct rtl8180_priv *priv = dev->priv;
210 struct rtl818x_rx_cmd_desc *cmd_desc; 210 struct rtl818x_rx_cmd_desc *cmd_desc;
211 unsigned int count = 32; 211 unsigned int count = 32;
212 u8 signal, agc, sq; 212 u8 agc, sq, signal = 1;
213 dma_addr_t mapping; 213 dma_addr_t mapping;
214 214
215 while (count--) { 215 while (count--) {
@@ -266,18 +266,21 @@ static void rtl8180_handle_rx(struct ieee80211_hw *dev)
266 rx_status.rate_idx = (flags >> 20) & 0xF; 266 rx_status.rate_idx = (flags >> 20) & 0xF;
267 agc = (flags2 >> 17) & 0x7F; 267 agc = (flags2 >> 17) & 0x7F;
268 268
269 if (priv->chip_family == RTL818X_CHIP_FAMILY_RTL8185) { 269 switch (priv->chip_family) {
270 case RTL818X_CHIP_FAMILY_RTL8185:
270 if (rx_status.rate_idx > 3) 271 if (rx_status.rate_idx > 3)
271 signal = 90 - clamp_t(u8, agc, 25, 90); 272 signal = 90 - clamp_t(u8, agc, 25, 90);
272 else 273 else
273 signal = 95 - clamp_t(u8, agc, 30, 95); 274 signal = 95 - clamp_t(u8, agc, 30, 95);
274 } else if (priv->chip_family == 275 break;
275 RTL818X_CHIP_FAMILY_RTL8180) { 276 case RTL818X_CHIP_FAMILY_RTL8180:
276 sq = flags2 & 0xff; 277 sq = flags2 & 0xff;
277 signal = priv->rf->calc_rssi(agc, sq); 278 signal = priv->rf->calc_rssi(agc, sq);
278 } else { 279 break;
280 case RTL818X_CHIP_FAMILY_RTL8187SE:
279 /* TODO: rtl8187se rssi */ 281 /* TODO: rtl8187se rssi */
280 signal = 10; 282 signal = 10;
283 break;
281 } 284 }
282 rx_status.signal = signal; 285 rx_status.signal = signal;
283 rx_status.freq = dev->conf.chandef.chan->center_freq; 286 rx_status.freq = dev->conf.chandef.chan->center_freq;