Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e70c0cfd authored by Luis R. Rodriguez's avatar Luis R. Rodriguez Committed by John W. Linville
Browse files

ath9k: rename ath9k_hw_ani_detach() to ath9k_hw_ani_disable() 



Signed-off-by: default avatarLuis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 081b35ab

drivers/net/wireless/ath/ath9k/ani.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -822,9 +822,9 @@ void ath9k_hw_ani_init(struct ath_hw *ah) 
		ah->proc_phyerr |= HAL_PROCESS_ANI;

		ah->proc_phyerr |= HAL_PROCESS_ANI;

}

}





void ath9k_hw_ani_detach(struct ath_hw *ah)

void ath9k_hw_ani_disable(struct ath_hw *ah)

{

{

	DPRINTF(ah->ah_sc, ATH_DBG_ANI, "Detach ANI\n");

	DPRINTF(ah->ah_sc, ATH_DBG_ANI, "Disabling ANI\n");





	if (ah->has_hw_phycounters) {

	if (ah->has_hw_phycounters) {

		ath9k_hw_disable_mib_counters(ah);

		ath9k_hw_disable_mib_counters(ah);

drivers/net/wireless/ath/ath9k/ani.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -133,6 +133,6 @@ void ath9k_hw_procmibevent(struct ath_hw *ah, 
			   const struct ath9k_node_stats *stats);

			   const struct ath9k_node_stats *stats);

void ath9k_hw_ani_setup(struct ath_hw *ah);

void ath9k_hw_ani_setup(struct ath_hw *ah);

void ath9k_hw_ani_init(struct ath_hw *ah);

void ath9k_hw_ani_init(struct ath_hw *ah);

void ath9k_hw_ani_detach(struct ath_hw *ah);

void ath9k_hw_ani_disable(struct ath_hw *ah);





#endif /* ANI_H */
 
#endif /* ANI_H */

drivers/net/wireless/ath/ath9k/hw.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1227,7 +1227,7 @@ const char *ath9k_hw_probe(u16 vendorid, u16 devid) 
void ath9k_hw_detach(struct ath_hw *ah)

void ath9k_hw_detach(struct ath_hw *ah)

{

{

	if (!AR_SREV_9100(ah))

	if (!AR_SREV_9100(ah))

		ath9k_hw_ani_detach(ah);

		ath9k_hw_ani_disable(ah);





	ath9k_hw_rf_free(ah);

	ath9k_hw_rf_free(ah);

	ath9k_hw_setpower(ah, ATH9K_PM_FULL_SLEEP);

	ath9k_hw_setpower(ah, ATH9K_PM_FULL_SLEEP);