brcm80211: drop unreachable else case
authorNicholas Mc Guire <hofrat@osadl.org>
Fri, 6 Feb 2015 13:26:50 +0000 (08:26 -0500)
committerKalle Valo <kvalo@codeaurora.org>
Thu, 26 Feb 2015 13:03:12 +0000 (15:03 +0200)
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>
drivers/net/wireless/brcm80211/brcmsmac/phy/phy_n.c

index 084f18f4f95039c921b1c82c548c904fcb6ccf67..99dac9b8a082c0bfcccf2769ef30585ea3af4e2d 100644 (file)
@@ -23041,10 +23041,7 @@ static void wlc_phy_rssi_cal_nphy_rev2(struct brcms_phy *pi, u8 rssi_type)
        else if (rssi_ctrl_state[0] == RADIO_2055_WBRSSI_G1_SEL)
                wlc_phy_rssisel_nphy(pi, RADIO_MIMO_CORESEL_CORE1,
                                     NPHY_RSSI_SEL_W1);
-       else if (rssi_ctrl_state[0] == RADIO_2055_WBRSSI_G2_SEL)
-               wlc_phy_rssisel_nphy(pi, RADIO_MIMO_CORESEL_CORE1,
-                                    NPHY_RSSI_SEL_W2);
-       else
+       else /* RADIO_2055_WBRSSI_G2_SEL */
                wlc_phy_rssisel_nphy(pi, RADIO_MIMO_CORESEL_CORE1,
                                     NPHY_RSSI_SEL_W2);
        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)
        else if (rssi_ctrl_state[1] == RADIO_2055_WBRSSI_G1_SEL)
                wlc_phy_rssisel_nphy(pi, RADIO_MIMO_CORESEL_CORE2,
                                     NPHY_RSSI_SEL_W1);
-       else if (rssi_ctrl_state[1] == RADIO_2055_WBRSSI_G2_SEL)
+       else /* RADIO_2055_WBRSSI_G1_SEL */
                wlc_phy_rssisel_nphy(pi, RADIO_MIMO_CORESEL_CORE2,
                                     NPHY_RSSI_SEL_W2);
-       else
-               wlc_phy_rssisel_nphy(pi, RADIO_MIMO_CORESEL_CORE2,
-                                    NPHY_RSSI_SEL_W2);
-
        wlc_phy_rssisel_nphy(pi, RADIO_MIMO_CORESEL_OFF, rssi_type);
 
        write_phy_reg(pi, 0x91, rfctrlintc_state[0]);