ath9k: rename btcoex_scheme to just scheme

btcoex_scheme is already part of a btcoex struct, its implied
this is btcoex related.

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

4 files changed, 13 insertions, 13 deletions

diff --git a/drivers/net/wireless/ath/ath9k/btcoex.c b/drivers/net/wireless/ath/ath9k/btcoex.c
index ab19072493cb..aa0ec2c2f326 100644
--- a/drivers/net/wireless/ath/ath9k/btcoex.c
+++ b/drivers/net/wireless/ath/ath9k/btcoex.c
@@ -147,7 +147,7 @@ void ath9k_hw_btcoex_enable(struct ath_hw *ah)
 {
         struct ath_btcoex_info *btcoex_info = &ah->btcoex_info;
 
-        switch (btcoex_info->btcoex_scheme) {
+        switch (btcoex_info->scheme) {
         case ATH_BTCOEX_CFG_NONE:
                 break;
         case ATH_BTCOEX_CFG_2WIRE:
@@ -174,7 +174,7 @@ void ath9k_hw_btcoex_disable(struct ath_hw *ah)
         ath9k_hw_cfg_output(ah, btcoex_info->wlanactive_gpio,
                         AR_GPIO_OUTPUT_MUX_AS_OUTPUT);
 
-        if (btcoex_info->btcoex_scheme == ATH_BTCOEX_CFG_3WIRE) {
+        if (btcoex_info->scheme == ATH_BTCOEX_CFG_3WIRE) {
                 REG_WRITE(ah, AR_BT_COEX_MODE, AR_BT_QUIET | AR_BT_MODE);
                 REG_WRITE(ah, AR_BT_COEX_WEIGHT, 0);
                 REG_WRITE(ah, AR_BT_COEX_MODE2, 0);
diff --git a/drivers/net/wireless/ath/ath9k/btcoex.h b/drivers/net/wireless/ath/ath9k/btcoex.h
index 72c613d9c53d..aea6d3fbb5b4 100644
--- a/drivers/net/wireless/ath/ath9k/btcoex.h
+++ b/drivers/net/wireless/ath/ath9k/btcoex.h
@@ -56,7 +56,7 @@ struct ath_btcoex_config {
 };
 
 struct ath_btcoex_info {
-        enum ath_btcoex_scheme btcoex_scheme;
+        enum ath_btcoex_scheme scheme;
         bool enabled;
         u8 wlanactive_gpio;
         u8 btactive_gpio;
diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c
index bbbd454fffef..0b7e2859c1ef 100644
--- a/drivers/net/wireless/ath/ath9k/hw.c
+++ b/drivers/net/wireless/ath/ath9k/hw.c
@@ -3733,13 +3733,13 @@ void ath9k_hw_fill_cap_info(struct ath_hw *ah)
                 btcoex_info->wlanactive_gpio = ATH_WLANACTIVE_GPIO;
 
                 if (AR_SREV_9285(ah)) {
-                        btcoex_info->btcoex_scheme = ATH_BTCOEX_CFG_3WIRE;
+                        btcoex_info->scheme = ATH_BTCOEX_CFG_3WIRE;
                         btcoex_info->btpriority_gpio = ATH_BTPRIORITY_GPIO;
                 } else {
-                        btcoex_info->btcoex_scheme = ATH_BTCOEX_CFG_2WIRE;
+                        btcoex_info->scheme = ATH_BTCOEX_CFG_2WIRE;
                 }
         } else {
-                btcoex_info->btcoex_scheme = ATH_BTCOEX_CFG_NONE;
+                btcoex_info->scheme = ATH_BTCOEX_CFG_NONE;
         }
 }
 
diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c
index 7ca6e3aa7bc4..3d0eb68c863c 100644
--- a/drivers/net/wireless/ath/ath9k/main.c
+++ b/drivers/net/wireless/ath/ath9k/main.c
@@ -443,7 +443,7 @@ void ath_update_chainmask(struct ath_softc *sc, int is_ht)
         struct ath_hw *ah = sc->sc_ah;
 
         if ((sc->sc_flags & SC_OP_SCANNING) || is_ht ||
-            (ah->btcoex_info.btcoex_scheme != ATH_BTCOEX_CFG_NONE)) {
+            (ah->btcoex_info.scheme != ATH_BTCOEX_CFG_NONE)) {
                 sc->tx_chainmask = sc->sc_ah->caps.tx_chainmask;
                 sc->rx_chainmask = sc->sc_ah->caps.rx_chainmask;
         } else {
@@ -511,7 +511,7 @@ static void ath9k_tasklet(unsigned long data)
                 sc->sc_flags |= SC_OP_WAIT_FOR_BEACON | SC_OP_BEACON_SYNC;
         }
 
-        if (ah->btcoex_info.btcoex_scheme == ATH_BTCOEX_CFG_3WIRE)
+        if (ah->btcoex_info.scheme == ATH_BTCOEX_CFG_3WIRE)
                 if (status & ATH9K_INT_GENTIMER)
                         ath_gen_timer_isr(sc->sc_ah);
 
@@ -1287,7 +1287,7 @@ void ath_detach(struct ath_softc *sc)
                         ath_tx_cleanupq(sc, &sc->tx.txq[i]);
 
         if ((sc->btcoex.no_stomp_timer) &&
-            ah->btcoex_info.btcoex_scheme == ATH_BTCOEX_CFG_3WIRE)
+            ah->btcoex_info.scheme == ATH_BTCOEX_CFG_3WIRE)
                 ath_gen_timer_free(ah, sc->btcoex.no_stomp_timer);
 
         ath9k_hw_detach(ah);
@@ -1674,7 +1674,7 @@ static int ath_init_softc(u16 devid, struct ath_softc *sc, u16 subsysid)
                         ARRAY_SIZE(ath9k_5ghz_chantable);
         }
 
-        switch (ah->btcoex_info.btcoex_scheme) {
+        switch (ah->btcoex_info.scheme) {
         case ATH_BTCOEX_CFG_NONE:
                 break;
         case ATH_BTCOEX_CFG_2WIRE:
@@ -2199,13 +2199,13 @@ static int ath9k_start(struct ieee80211_hw *hw)
 
         ieee80211_queue_delayed_work(sc->hw, &sc->tx_complete_work, 0);
 
-        if ((ah->btcoex_info.btcoex_scheme != ATH_BTCOEX_CFG_NONE) &&
+        if ((ah->btcoex_info.scheme != ATH_BTCOEX_CFG_NONE) &&
             !ah->btcoex_info.enabled) {
                 ath9k_hw_btcoex_init_weight(ah);
                 ath9k_hw_btcoex_enable(ah);
 
                 ath_pcie_aspm_disable(sc);
-                if (ah->btcoex_info.btcoex_scheme == ATH_BTCOEX_CFG_3WIRE)
+                if (ah->btcoex_info.scheme == ATH_BTCOEX_CFG_3WIRE)
                         ath9k_btcoex_timer_resume(sc);
         }
 
@@ -2361,7 +2361,7 @@ static void ath9k_stop(struct ieee80211_hw *hw)
 
         if (ah->btcoex_info.enabled) {
                 ath9k_hw_btcoex_disable(ah);
-                if (ah->btcoex_info.btcoex_scheme == ATH_BTCOEX_CFG_3WIRE)
+                if (ah->btcoex_info.scheme == ATH_BTCOEX_CFG_3WIRE)
                         ath9k_btcoex_timer_pause(sc);
         }