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

ath9k_hw: rename ath9k_hw_rf_free() to ath9k_hw_rf_free_ext_banks() 



This clarifies this is only required for external radios.

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

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

+2 −1
Original line number Diff line number Diff line
@@ -1282,7 +1282,8 @@ void ath9k_hw_detach(struct ath_hw *ah) 
	ath9k_hw_setpower(ah, ATH9K_PM_FULL_SLEEP);



free_hw:

	ath9k_hw_rf_free(ah);

	if (!AR_SREV_9280_10_OR_LATER(ah))

		ath9k_hw_rf_free_ext_banks(ah);

	kfree(ah);

	ah = NULL;

}

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

+0 −1
Original line number Diff line number Diff line
@@ -628,7 +628,6 @@ static inline struct ath_regulatory *ath9k_hw_regulatory(struct ath_hw *ah) 
const char *ath9k_hw_probe(u16 vendorid, u16 devid);

void ath9k_hw_detach(struct ath_hw *ah);

int ath9k_hw_init(struct ath_hw *ah);

void ath9k_hw_rf_free(struct ath_hw *ah);

int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan,

		   bool bChannelChange);

void ath9k_hw_fill_cap_info(struct ath_hw *ah);

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

+6 −3
Original line number Diff line number Diff line
@@ -384,18 +384,20 @@ ath9k_hw_set_rf_regs(struct ath_hw *ah, struct ath9k_channel *chan, 
}



/**

 * ath9k_hw_rf_free - Free memory for analog bank scratch buffers

 * ath9k_hw_rf_free_ext_banks - Free memory for analog bank scratch buffers

 * @ah: atheros hardware struture

 * For the external AR2133/AR5133 radios.

 * For the external AR2133/AR5133 radios banks.

 */

void

ath9k_hw_rf_free(struct ath_hw *ah)

ath9k_hw_rf_free_ext_banks(struct ath_hw *ah)

{

#define ATH_FREE_BANK(bank) do { \

		kfree(bank); \

		bank = NULL; \

	} while (0);



	BUG_ON(AR_SREV_9280_10_OR_LATER(ah));



	ATH_FREE_BANK(ah->analogBank0Data);

	ATH_FREE_BANK(ah->analogBank1Data);

	ATH_FREE_BANK(ah->analogBank2Data);
@@ -405,6 +407,7 @@ ath9k_hw_rf_free(struct ath_hw *ah) 
	ATH_FREE_BANK(ah->analogBank7Data);

	ATH_FREE_BANK(ah->addac5416_21);

	ATH_FREE_BANK(ah->bank6Temp);



#undef ATH_FREE_BANK

}

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

+2 −0
Original line number Diff line number Diff line
@@ -29,6 +29,8 @@ bool ath9k_hw_set_rf_regs(struct ath_hw *ah, 
			  u16 modesIndex);

void ath9k_hw_decrease_chain_power(struct ath_hw *ah,

				   struct ath9k_channel *chan);



void ath9k_hw_rf_free_ext_banks(struct ath_hw *ah);

int ath9k_hw_rf_alloc_ext_banks(struct ath_hw *ah);



#define AR_PHY_BASE     0x9800

CRA Git | Maintained and supported by SUSTech CRA and CCSE