brcmsmac: phy_lcn: remove duplicate code

Remove and refactor some code in order to avoid having identical code
for different branches.

Notice that this piece of code hasn't been modified since 2011.

Addresses-Coverity-ID: 1226756 ("Identical code for different branches")
Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_lcn.c b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_lcn.c
index 93d4cde0eb3135bbb4334a5ba482437744c09592..9d830d27b22926a73fea9ab681c50a8dfb5951d4 100644 (file)
--- a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_lcn.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_lcn.c
@@ -3388,13 +3388,8 @@ void wlc_lcnphy_deaf_mode(struct brcms_phy *pi, bool mode)
        u8 phybw40;
        phybw40 = CHSPEC_IS40(pi->radio_chanspec);
 
-       if (LCNREV_LT(pi->pubpi.phy_rev, 2)) {
-               mod_phy_reg(pi, 0x4b0, (0x1 << 5), (mode) << 5);
-               mod_phy_reg(pi, 0x4b1, (0x1 << 9), 0 << 9);
-       } else {
-               mod_phy_reg(pi, 0x4b0, (0x1 << 5), (mode) << 5);
-               mod_phy_reg(pi, 0x4b1, (0x1 << 9), 0 << 9);
-       }
+       mod_phy_reg(pi, 0x4b0, (0x1 << 5), (mode) << 5);
+       mod_phy_reg(pi, 0x4b1, (0x1 << 9), 0 << 9);
 
        if (phybw40 == 0) {
                mod_phy_reg((pi), 0x410,