ath9k: Remove hw capability bit meant for btcoex

We don't need a hw cap bit for btcoex anymore as btcoex scheme type
is enough to do this.

Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c
index 7b4bc8b74bb85d09f5ccd5dbfde1ea004c4d3b35..c80be8c78e8bdb4a75523987b92e821d6314fc32 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/hw.c
+++ b/drivers/net/wireless/ath/ath9k/hw.c
@@ -3666,7 +3666,6 @@ void ath9k_hw_fill_cap_info(struct ath_hw *ah)
                ah->eep_ops->get_num_ant_config(ah, ATH9K_HAL_FREQ_BAND_2GHZ);
 
        if (AR_SREV_9280_10_OR_LATER(ah) && btcoex_enable) {
-               pCap->hw_caps |= ATH9K_HW_CAP_BT_COEX;
                btcoex_info->btactive_gpio = ATH_BTACTIVE_GPIO;
                btcoex_info->wlanactive_gpio = ATH_WLANACTIVE_GPIO;
 

diff --git a/drivers/net/wireless/ath/ath9k/hw.h b/drivers/net/wireless/ath/ath9k/hw.h
index 259936c904677adca3e64672446ebfdf3c3ecdfc..de10de8370d2fe906528eaa72f5fb8fb8189c725 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/hw.h
+++ b/drivers/net/wireless/ath/ath9k/hw.h
@@ -151,7 +151,6 @@ enum ath9k_hw_caps {
        ATH9K_HW_CAP_ENHANCEDPM                 = BIT(14),
        ATH9K_HW_CAP_AUTOSLEEP                  = BIT(15),
        ATH9K_HW_CAP_4KB_SPLITTRANS             = BIT(16),
-       ATH9K_HW_CAP_BT_COEX                    = BIT(17)
 };
 
 enum ath9k_capability_type {

diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c
index 8a2f000274b575be622623590f8f02ba2d7fa4b2..215c67251f791ecc080c18a0f7ad5a25d01ea655 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/main.c
+++ b/drivers/net/wireless/ath/ath9k/main.c
@@ -440,7 +440,7 @@ static void ath_start_ani(struct ath_softc *sc)
 void ath_update_chainmask(struct ath_softc *sc, int is_ht)
 {
        if ((sc->sc_flags & SC_OP_SCANNING) || is_ht ||
-           (sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_BT_COEX)) {
+           (sc->btcoex_info.btcoex_scheme != ATH_BTCOEX_CFG_NONE)) {
                sc->tx_chainmask = sc->sc_ah->caps.tx_chainmask;
                sc->rx_chainmask = sc->sc_ah->caps.rx_chainmask;
        } else {
@@ -1509,8 +1509,7 @@ static int ath_init_softc(u16 devid, struct ath_softc *sc)
                        ARRAY_SIZE(ath9k_5ghz_chantable);
        }
 
-       if ((ah->caps.hw_caps & ATH9K_HW_CAP_BT_COEX) &&
-           (sc->btcoex_info.btcoex_scheme == ATH_BTCOEX_CFG_2WIRE))
+       if (sc->btcoex_info.btcoex_scheme == ATH_BTCOEX_CFG_2WIRE)
                ath9k_hw_btcoex_init(ah);
 
        return 0;
@@ -1993,8 +1992,7 @@ static int ath9k_start(struct ieee80211_hw *hw)
 
        ieee80211_queue_delayed_work(sc->hw, &sc->tx_complete_work, 0);
 
-       if ((sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_BT_COEX) &&
-           (sc->btcoex_info.btcoex_scheme == ATH_BTCOEX_CFG_2WIRE) &&
+       if ((sc->btcoex_info.btcoex_scheme == ATH_BTCOEX_CFG_2WIRE) &&
            !(sc->sc_flags & SC_OP_BTCOEX_ENABLED))
                ath9k_hw_btcoex_enable(sc->sc_ah);