aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/wireless/ath/ath9k/ani.c9
-rw-r--r--drivers/net/wireless/ath/ath9k/ani.h1
-rw-r--r--drivers/net/wireless/ath/ath9k/hw.c3
3 files changed, 0 insertions, 13 deletions
diff --git a/drivers/net/wireless/ath/ath9k/ani.c b/drivers/net/wireless/ath/ath9k/ani.c
index cec62d311c78..ba8b20f01594 100644
--- a/drivers/net/wireless/ath/ath9k/ani.c
+++ b/drivers/net/wireless/ath/ath9k/ani.c
@@ -657,12 +657,3 @@ void ath9k_hw_ani_init(struct ath_hw *ah)
657 if (ah->config.enable_ani) 657 if (ah->config.enable_ani)
658 ah->proc_phyerr |= HAL_PROCESS_ANI; 658 ah->proc_phyerr |= HAL_PROCESS_ANI;
659} 659}
660
661void ath9k_hw_ani_disable(struct ath_hw *ah)
662{
663 ath_print(ath9k_hw_common(ah), ATH_DBG_ANI, "Disabling ANI\n");
664
665 ath9k_hw_disable_mib_counters(ah);
666 REG_WRITE(ah, AR_PHY_ERR_1, 0);
667 REG_WRITE(ah, AR_PHY_ERR_2, 0);
668}
diff --git a/drivers/net/wireless/ath/ath9k/ani.h b/drivers/net/wireless/ath/ath9k/ani.h
index 4e1ab94a5153..3356762ea384 100644
--- a/drivers/net/wireless/ath/ath9k/ani.h
+++ b/drivers/net/wireless/ath/ath9k/ani.h
@@ -118,6 +118,5 @@ u32 ath9k_hw_GetMibCycleCountsPct(struct ath_hw *ah, u32 *rxc_pcnt,
118void ath9k_hw_procmibevent(struct ath_hw *ah); 118void ath9k_hw_procmibevent(struct ath_hw *ah);
119void ath9k_hw_ani_setup(struct ath_hw *ah); 119void ath9k_hw_ani_setup(struct ath_hw *ah);
120void ath9k_hw_ani_init(struct ath_hw *ah); 120void ath9k_hw_ani_init(struct ath_hw *ah);
121void ath9k_hw_ani_disable(struct ath_hw *ah);
122 121
123#endif /* ANI_H */ 122#endif /* ANI_H */
diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c
index 11e6a897c21a..b6d12e52d30e 100644
--- a/drivers/net/wireless/ath/ath9k/hw.c
+++ b/drivers/net/wireless/ath/ath9k/hw.c
@@ -818,9 +818,6 @@ void ath9k_hw_deinit(struct ath_hw *ah)
818 if (common->state < ATH_HW_INITIALIZED) 818 if (common->state < ATH_HW_INITIALIZED)
819 goto free_hw; 819 goto free_hw;
820 820
821 if (!AR_SREV_9100(ah))
822 ath9k_hw_ani_disable(ah);
823
824 ath9k_hw_setpower(ah, ATH9K_PM_FULL_SLEEP); 821 ath9k_hw_setpower(ah, ATH9K_PM_FULL_SLEEP);
825 822
826free_hw: 823free_hw: