aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicholas Mc Guire <hofrat@osadl.org>2015-02-06 08:26:50 -0500
committerKalle Valo <kvalo@codeaurora.org>2015-02-26 08:03:12 -0500
commit01317c264166babe695174aa0d9e6cd93055df1a (patch)
tree0aa9248b7bca067a28fff99e26a978718d23c050
parent187d3c3386be51f2c9655ec52ddb4a1046c73332 (diff)
brcm80211: drop unreachable else case
the if/elseif/else is exhaustive - there is no 4th case given the rssi_ctrl_mask = RADIO_2055_NBRSSI_SEL | RADIO_2055_WBRSSI_G1_SEL | RADIO_2055_WBRSSI_G2_SEL; so this unreachable else case (dead code) can be dropped. Signed-off-by: Nicholas Mc Guire <hofrat@osadl.org> Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
-rw-r--r--drivers/net/wireless/brcm80211/brcmsmac/phy/phy_n.c11
1 files changed, 2 insertions, 9 deletions
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_n.c b/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_n.c
index 084f18f4f950..99dac9b8a082 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_n.c
+++ b/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_n.c
@@ -23041,10 +23041,7 @@ static void wlc_phy_rssi_cal_nphy_rev2(struct brcms_phy *pi, u8 rssi_type)
23041 else if (rssi_ctrl_state[0] == RADIO_2055_WBRSSI_G1_SEL) 23041 else if (rssi_ctrl_state[0] == RADIO_2055_WBRSSI_G1_SEL)
23042 wlc_phy_rssisel_nphy(pi, RADIO_MIMO_CORESEL_CORE1, 23042 wlc_phy_rssisel_nphy(pi, RADIO_MIMO_CORESEL_CORE1,
23043 NPHY_RSSI_SEL_W1); 23043 NPHY_RSSI_SEL_W1);
23044 else if (rssi_ctrl_state[0] == RADIO_2055_WBRSSI_G2_SEL) 23044 else /* RADIO_2055_WBRSSI_G2_SEL */
23045 wlc_phy_rssisel_nphy(pi, RADIO_MIMO_CORESEL_CORE1,
23046 NPHY_RSSI_SEL_W2);
23047 else
23048 wlc_phy_rssisel_nphy(pi, RADIO_MIMO_CORESEL_CORE1, 23045 wlc_phy_rssisel_nphy(pi, RADIO_MIMO_CORESEL_CORE1,
23049 NPHY_RSSI_SEL_W2); 23046 NPHY_RSSI_SEL_W2);
23050 if (rssi_ctrl_state[1] == RADIO_2055_NBRSSI_SEL) 23047 if (rssi_ctrl_state[1] == RADIO_2055_NBRSSI_SEL)
@@ -23053,13 +23050,9 @@ static void wlc_phy_rssi_cal_nphy_rev2(struct brcms_phy *pi, u8 rssi_type)
23053 else if (rssi_ctrl_state[1] == RADIO_2055_WBRSSI_G1_SEL) 23050 else if (rssi_ctrl_state[1] == RADIO_2055_WBRSSI_G1_SEL)
23054 wlc_phy_rssisel_nphy(pi, RADIO_MIMO_CORESEL_CORE2, 23051 wlc_phy_rssisel_nphy(pi, RADIO_MIMO_CORESEL_CORE2,
23055 NPHY_RSSI_SEL_W1); 23052 NPHY_RSSI_SEL_W1);
23056 else if (rssi_ctrl_state[1] == RADIO_2055_WBRSSI_G2_SEL) 23053 else /* RADIO_2055_WBRSSI_G1_SEL */
23057 wlc_phy_rssisel_nphy(pi, RADIO_MIMO_CORESEL_CORE2, 23054 wlc_phy_rssisel_nphy(pi, RADIO_MIMO_CORESEL_CORE2,
23058 NPHY_RSSI_SEL_W2); 23055 NPHY_RSSI_SEL_W2);
23059 else
23060 wlc_phy_rssisel_nphy(pi, RADIO_MIMO_CORESEL_CORE2,
23061 NPHY_RSSI_SEL_W2);
23062
23063 wlc_phy_rssisel_nphy(pi, RADIO_MIMO_CORESEL_OFF, rssi_type); 23056 wlc_phy_rssisel_nphy(pi, RADIO_MIMO_CORESEL_OFF, rssi_type);
23064 23057
23065 write_phy_reg(pi, 0x91, rfctrlintc_state[0]); 23058 write_phy_reg(pi, 0x91, rfctrlintc_state[0]);