1 files changed, 3 insertions, 61 deletions

diff --git a/drivers/net/wireless/ath/ath9k/ani.c b/drivers/net/wireless/ath/ath9k/ani.c
index f2aa68405d2..3aa8fb1ad77 100644
--- a/drivers/net/wireless/ath/ath9k/ani.c
+++ b/drivers/net/wireless/ath/ath9k/ani.c
@@ -465,18 +465,6 @@ static void ath9k_hw_ani_lower_immunity(struct ath_hw *ah)
                 ath9k_hw_set_cck_nil(ah, aniState->cckNoiseImmunityLevel - 1);
 }
 
-static int32_t ath9k_hw_ani_get_listen_time(struct ath_hw *ah)
-{
-        struct ath_common *common = ath9k_hw_common(ah);
-        int32_t listen_time;
-
-        ath9k_hw_update_cycle_counters(ah);
-        listen_time = ah->listen_time / (common->clockrate * 1000);
-        ah->listen_time = 0;
-
-        return listen_time;
-}
-
 static void ath9k_ani_reset_old(struct ath_hw *ah, bool is_scanning)
 {
         struct ar5416AniState *aniState;
@@ -655,7 +643,9 @@ static void ath9k_hw_ani_read_counters(struct ath_hw *ah)
         u32 phyCnt1, phyCnt2;
         int32_t listenTime;
 
-        listenTime = ath9k_hw_ani_get_listen_time(ah);
+        ath_hw_cycle_counters_update(common);
+        listenTime = ath_hw_get_listen_time(common);
+
         if (listenTime < 0) {
                 ah->stats.ast_ani_lneg++;
                 ath9k_ani_restart(ah);
@@ -796,54 +786,6 @@ void ath9k_hw_disable_mib_counters(struct ath_hw *ah)
 }
 EXPORT_SYMBOL(ath9k_hw_disable_mib_counters);
 
-void ath9k_hw_update_cycle_counters(struct ath_hw *ah)
-{
-        struct ath_cycle_counters cc;
-        bool clear;
-
-        memcpy(&cc, &ah->cc, sizeof(cc));
-
-        /* freeze counters */
-        REG_WRITE(ah, AR_MIBC, AR_MIBC_FMC);
-
-        ah->cc.cycles = REG_READ(ah, AR_CCCNT);
-        if (ah->cc.cycles < cc.cycles) {
-                clear = true;
-                goto skip;
-        }
-
-        ah->cc.rx_clear = REG_READ(ah, AR_RCCNT);
-        ah->cc.rx_frame = REG_READ(ah, AR_RFCNT);
-        ah->cc.tx_frame = REG_READ(ah, AR_TFCNT);
-
-        /* prevent wraparound */
-        if (ah->cc.cycles & BIT(31))
-                clear = true;
-
-#define CC_DELTA(_field, _reg) ah->cc_delta._field += ah->cc._field - cc._field
-        CC_DELTA(cycles, AR_CCCNT);
-        CC_DELTA(rx_frame, AR_RFCNT);
-        CC_DELTA(rx_clear, AR_RCCNT);
-        CC_DELTA(tx_frame, AR_TFCNT);
-#undef CC_DELTA
-
-        ah->listen_time += (ah->cc.cycles - cc.cycles) -
-                 ((ah->cc.rx_frame - cc.rx_frame) +
-                  (ah->cc.tx_frame - cc.tx_frame));
-
-skip:
-        if (clear) {
-                REG_WRITE(ah, AR_CCCNT, 0);
-                REG_WRITE(ah, AR_RFCNT, 0);
-                REG_WRITE(ah, AR_RCCNT, 0);
-                REG_WRITE(ah, AR_TFCNT, 0);
-                memset(&ah->cc, 0, sizeof(ah->cc));
-        }
-
-        /* unfreeze counters */
-        REG_WRITE(ah, AR_MIBC, 0);
-}
-
 /*
  * Process a MIB interrupt.  We may potentially be invoked because
  * any of the MIB counters overflow/trigger so don't assume we're