diff options
author | Luis R. Rodriguez <lrodriguez@atheros.com> | 2009-08-03 15:24:51 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-08-04 16:44:32 -0400 |
commit | e70c0cfdbf98384d9ce0b7a7332b6e60ec22ad54 (patch) | |
tree | 884e94a58c54b8dddeb384a953cec3be717d1c24 /drivers | |
parent | 081b35ab2e98a2f76d0378219e91cd1c90aed55f (diff) |
ath9k: rename ath9k_hw_ani_detach() to ath9k_hw_ani_disable()
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/wireless/ath/ath9k/ani.c | 4 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath9k/ani.h | 2 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath9k/hw.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/wireless/ath/ath9k/ani.c b/drivers/net/wireless/ath/ath9k/ani.c index a613cf46eebc..b7093126dbb8 100644 --- a/drivers/net/wireless/ath/ath9k/ani.c +++ b/drivers/net/wireless/ath/ath9k/ani.c | |||
@@ -822,9 +822,9 @@ void ath9k_hw_ani_init(struct ath_hw *ah) | |||
822 | ah->proc_phyerr |= HAL_PROCESS_ANI; | 822 | ah->proc_phyerr |= HAL_PROCESS_ANI; |
823 | } | 823 | } |
824 | 824 | ||
825 | void ath9k_hw_ani_detach(struct ath_hw *ah) | 825 | void ath9k_hw_ani_disable(struct ath_hw *ah) |
826 | { | 826 | { |
827 | DPRINTF(ah->ah_sc, ATH_DBG_ANI, "Detach ANI\n"); | 827 | DPRINTF(ah->ah_sc, ATH_DBG_ANI, "Disabling ANI\n"); |
828 | 828 | ||
829 | if (ah->has_hw_phycounters) { | 829 | if (ah->has_hw_phycounters) { |
830 | ath9k_hw_disable_mib_counters(ah); | 830 | ath9k_hw_disable_mib_counters(ah); |
diff --git a/drivers/net/wireless/ath/ath9k/ani.h b/drivers/net/wireless/ath/ath9k/ani.h index 803669faaade..a36b7bb7c42a 100644 --- a/drivers/net/wireless/ath/ath9k/ani.h +++ b/drivers/net/wireless/ath/ath9k/ani.h | |||
@@ -133,6 +133,6 @@ void ath9k_hw_procmibevent(struct ath_hw *ah, | |||
133 | const struct ath9k_node_stats *stats); | 133 | const struct ath9k_node_stats *stats); |
134 | void ath9k_hw_ani_setup(struct ath_hw *ah); | 134 | void ath9k_hw_ani_setup(struct ath_hw *ah); |
135 | void ath9k_hw_ani_init(struct ath_hw *ah); | 135 | void ath9k_hw_ani_init(struct ath_hw *ah); |
136 | void ath9k_hw_ani_detach(struct ath_hw *ah); | 136 | void ath9k_hw_ani_disable(struct ath_hw *ah); |
137 | 137 | ||
138 | #endif /* ANI_H */ | 138 | #endif /* ANI_H */ |
diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c index 73dee19e8870..6641fbedd6d0 100644 --- a/drivers/net/wireless/ath/ath9k/hw.c +++ b/drivers/net/wireless/ath/ath9k/hw.c | |||
@@ -1227,7 +1227,7 @@ const char *ath9k_hw_probe(u16 vendorid, u16 devid) | |||
1227 | void ath9k_hw_detach(struct ath_hw *ah) | 1227 | void ath9k_hw_detach(struct ath_hw *ah) |
1228 | { | 1228 | { |
1229 | if (!AR_SREV_9100(ah)) | 1229 | if (!AR_SREV_9100(ah)) |
1230 | ath9k_hw_ani_detach(ah); | 1230 | ath9k_hw_ani_disable(ah); |
1231 | 1231 | ||
1232 | ath9k_hw_rf_free(ah); | 1232 | ath9k_hw_rf_free(ah); |
1233 | ath9k_hw_setpower(ah, ATH9K_PM_FULL_SLEEP); | 1233 | ath9k_hw_setpower(ah, ATH9K_PM_FULL_SLEEP); |