ath9k: move bt_stomp_type to driver core

The bt_stomp_type defines the bt coex weight, it has a one-to-one
mapping. In the future we may want to just use the weight directly.

Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/ath/ath9k/ath9k.h b/drivers/net/wireless/ath/ath9k/ath9k.h
index 891e71b10e5c3bb9de0d0d904a79aa13ae50f5a4..d99c92d7b94916c7175a64cd63f3c21285a221c5 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/ath9k.h
+++ b/drivers/net/wireless/ath/ath9k/ath9k.h
@@ -450,12 +450,21 @@ struct ath_ani {
        struct timer_list timer;
 };
 
+/* Defines the BT AR_BT_COEX_WGHT used */
+enum ath_stomp_type {
+       ATH_BTCOEX_NO_STOMP,
+       ATH_BTCOEX_STOMP_ALL,
+       ATH_BTCOEX_STOMP_LOW,
+       ATH_BTCOEX_STOMP_NONE
+};
+
 struct ath_btcoex {
        bool hw_timer_enabled;
        spinlock_t btcoex_lock;
        struct timer_list period_timer; /* Timer for BT period */
        u32 bt_priority_cnt;
        unsigned long bt_priority_time;
+       int bt_stomp_type; /* Types of BT stomping */
        u32 btcoex_no_stomp; /* in usec */
        u32 btcoex_period; /* in usec */
        struct ath_gen_timer *no_stomp_timer; /* Timer for no BT stomping */

diff --git a/drivers/net/wireless/ath/ath9k/btcoex.c b/drivers/net/wireless/ath/ath9k/btcoex.c
index 91befc78a15b66d06f59284d244fe4ab12219d2b..ab19072493cb81bc108cb33e5528f848c38151b3 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/btcoex.c
+++ b/drivers/net/wireless/ath/ath9k/btcoex.c
@@ -65,8 +65,6 @@ void ath9k_hw_init_btcoex_hw_info(struct ath_hw *ah, int qnum)
                SM(ATH_BTCOEX_BMISS_THRESH, AR_BT_BCN_MISS_THRESH) |
                AR_BT_DISABLE_BT_ANT;
 
-       btcoex_info->bt_stomp_type = ATH_BTCOEX_STOMP_LOW;
-
        for (i = 0; i < 32; i++)
                ah->hw_gen_timers.gen_timer_index[(debruijn32 << i) >> 27] = i;
 }

diff --git a/drivers/net/wireless/ath/ath9k/btcoex.h b/drivers/net/wireless/ath/ath9k/btcoex.h
index b2c3f766985203a94d879f3750fd83a91ff51305..d932f01f77319aa5ba6ac3ec35cfc3d1927a314f 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/btcoex.h
+++ b/drivers/net/wireless/ath/ath9k/btcoex.h
@@ -36,13 +36,6 @@ enum ath_btcoex_scheme {
        ATH_BTCOEX_CFG_3WIRE,
 };
 
-enum ath_stomp_type {
-       ATH_BTCOEX_NO_STOMP,
-       ATH_BTCOEX_STOMP_ALL,
-       ATH_BTCOEX_STOMP_LOW,
-       ATH_BTCOEX_STOMP_NONE
-};
-
 enum ath_bt_mode {
        ATH_BT_COEX_MODE_LEGACY,        /* legacy rx_clear mode */
        ATH_BT_COEX_MODE_UNSLOTTED,     /* untimed/unslotted mode */
@@ -69,7 +62,6 @@ struct ath_btcoex_info {
        u8 btactive_gpio;
        u8 btpriority_gpio;
        u8 bt_duty_cycle;       /* BT duty cycle in percentage */
-       int bt_stomp_type;      /* Types of BT stomping */
        u32 bt_coex_mode;       /* Register setting for AR_BT_COEX_MODE */
        u32 bt_coex_weights;    /* Register setting for AR_BT_COEX_WEIGHT */
        u32 bt_coex_mode2;      /* Register setting for AR_BT_COEX_MODE2 */

diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c
index cd1bc9c27527413aa2923ba6ab14dfcea387da8a..7ca6e3aa7bc43598598a5e10bc2314e538bad3ba 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/main.c
+++ b/drivers/net/wireless/ath/ath9k/main.c
@@ -1391,7 +1391,7 @@ static void ath_btcoex_period_timer(unsigned long data)
 
        spin_lock_bh(&btcoex->btcoex_lock);
 
-       ath_btcoex_bt_stomp(sc, btinfo, btinfo->bt_stomp_type);
+       ath_btcoex_bt_stomp(sc, btinfo, btcoex->bt_stomp_type);
 
        spin_unlock_bh(&btcoex->btcoex_lock);
 
@@ -1426,9 +1426,9 @@ static void ath_btcoex_no_stomp_timer(void *arg)
 
        spin_lock_bh(&btcoex->btcoex_lock);
 
-       if (btinfo->bt_stomp_type == ATH_BTCOEX_STOMP_LOW)
+       if (btcoex->bt_stomp_type == ATH_BTCOEX_STOMP_LOW)
                ath_btcoex_bt_stomp(sc, btinfo, ATH_BTCOEX_STOMP_NONE);
-        else if (btinfo->bt_stomp_type == ATH_BTCOEX_STOMP_ALL)
+        else if (btcoex->bt_stomp_type == ATH_BTCOEX_STOMP_ALL)
                ath_btcoex_bt_stomp(sc, btinfo, ATH_BTCOEX_STOMP_LOW);
 
        spin_unlock_bh(&btcoex->btcoex_lock);
@@ -1687,6 +1687,7 @@ static int ath_init_softc(u16 devid, struct ath_softc *sc, u16 subsysid)
                        goto bad2;
                qnum = ath_tx_get_qnum(sc, ATH9K_TX_QUEUE_DATA, ATH9K_WME_AC_BE);
                ath9k_hw_init_btcoex_hw_info(ah, qnum);
+               sc->btcoex.bt_stomp_type = ATH_BTCOEX_STOMP_LOW;
                break;
        default:
                WARN_ON(1);