Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux...

[~andy/linux] / drivers / net / wireless / ath / ath9k / ar9003_phy.c

diff --git a/drivers/net/wireless/ath/ath9k/ar9003_phy.c b/drivers/net/wireless/ath/ath9k/ar9003_phy.c
index 18a5aa4fe406670fe435f6aeefe4a9aab150b26d..e897648d32335dd1800df489916afa80fca81a2b 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/ar9003_phy.c
+++ b/drivers/net/wireless/ath/ath9k/ar9003_phy.c
@@ -1193,8 +1193,6 @@ skip_ws_det:
                }
        break;
        }
-       case ATH9K_ANI_PRESENT:
-               break;
        default:
                ath_dbg(common, ANI, "invalid cmd %u\n", cmd);
                return false;
@@ -1449,7 +1447,7 @@ static void ar9003_hw_set_bt_ant_diversity(struct ath_hw *ah, bool enable)
        regval |= (ant_div_ctl1 & 0x3f) << AR_ANT_DIV_CTRL_ALL_S;
        REG_WRITE(ah, AR_PHY_MC_GAIN_CTRL, regval);
 
-       if (AR_SREV_9485_11(ah)) {
+       if (AR_SREV_9485_11_OR_LATER(ah)) {
                /*
                 * Enable LNA diversity.
                 */