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

Commit d9ae96d9 authored by Sujith's avatar Sujith Committed by John W. Linville
Browse files

ath9k: Remove multiple macro occurrences 



OLC_FOR_AR9280_20_LATER is defined in multiple places,
move it to a common location.

Signed-off-by: default avatarSujith <Sujith.Manoharan@atheros.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent f452a63d

drivers/net/wireless/ath9k/calib.c

+0 −2
Original line number Diff line number Diff line
@@ -749,8 +749,6 @@ bool ath9k_hw_calibrate(struct ath_hw *ah, struct ath9k_channel *chan, 
			u8 rxchainmask, bool longcal,

			bool *isCalDone)

{

#define OLC_FOR_AR9280_20_LATER	(AR_SREV_9280_20_OR_LATER(ah) && \

				ah->eep_ops->get_eeprom(ah, EEP_OL_PWRCTRL))

	struct hal_cal_list *currCal = ah->cal_list_curr;



	*isCalDone = true;

drivers/net/wireless/ath9k/eeprom.c

+0 −2
Original line number Diff line number Diff line
@@ -2164,8 +2164,6 @@ static bool ath9k_hw_set_def_power_cal_table(struct ath_hw *ah, 
				  struct ath9k_channel *chan,

				  int16_t *pTxPowerIndexOffset)

{

#define OLC_FOR_AR9280_20_LATER	(AR_SREV_9280_20_OR_LATER(ah) && \

				ah->eep_ops->get_eeprom(ah, EEP_OL_PWRCTRL))

#define SM_PD_GAIN(x) SM(0x38, AR_PHY_TPCRG5_PD_GAIN_BOUNDARY_##x)

#define SM_PDGAIN_B(x, y) \

		SM((gainBoundaries[x]), AR_PHY_TPCRG5_PD_GAIN_BOUNDARY_##y)

drivers/net/wireless/ath9k/eeprom.h

+3 −0
Original line number Diff line number Diff line
@@ -95,6 +95,9 @@ 
#define FREQ2FBIN(x, y)		((y) ? ((x) - 2300) : (((x) - 4800) / 5))

#define ath9k_hw_use_flash(_ah)	(!(_ah->ah_flags & AH_USE_EEPROM))



#define OLC_FOR_AR9280_20_LATER (AR_SREV_9280_20_OR_LATER(ah) && \

				 ah->eep_ops->get_eeprom(ah, EEP_OL_PWRCTRL))



#define AR_EEPROM_RFSILENT_GPIO_SEL     0x001c

#define AR_EEPROM_RFSILENT_GPIO_SEL_S   2

#define AR_EEPROM_RFSILENT_POLARITY     0x0002

drivers/net/wireless/ath9k/hw.c

+0 −2
Original line number Diff line number Diff line
@@ -1219,8 +1219,6 @@ static int ath9k_hw_process_ini(struct ath_hw *ah, 
				struct ath9k_channel *chan,

				enum ath9k_ht_macmode macmode)

{

#define OLC_FOR_AR9280_20_LATER	(AR_SREV_9280_20_OR_LATER(ah) && \

				ah->eep_ops->get_eeprom(ah, EEP_OL_PWRCTRL))

	int i, regWrites = 0;

	struct ieee80211_channel *channel = chan->chan;

	u32 modesIndex, freqIndex;