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

Commit f9dd6b52 authored by Gabor Juhos's avatar Gabor Juhos Committed by John W. Linville
Browse files

ath9k: remove redundant AR9285 checks 



The AR_SREV_9285_1[12]_OR_LATER macros already contains the
AR_SREV_9285 check.

Signed-off-by: default avatarGabor Juhos <juhosg@openwrt.org>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 4f0fc7c3

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

+3 −3
Original line number Diff line number Diff line
@@ -863,7 +863,7 @@ bool ath9k_hw_calibrate(struct ath_hw *ah, struct ath9k_channel *chan, 
	}



	if (longcal) {

		if (AR_SREV_9285(ah) && AR_SREV_9285_11_OR_LATER(ah))

		if (AR_SREV_9285_11_OR_LATER(ah))

			ath9k_hw_9285_pa_cal(ah);



		if (OLC_FOR_AR9280_20_LATER)
@@ -917,7 +917,7 @@ static bool ar9285_clc(struct ath_hw *ah, struct ath9k_channel *chan) 


bool ath9k_hw_init_cal(struct ath_hw *ah, struct ath9k_channel *chan)

{

	if (AR_SREV_9285(ah) && AR_SREV_9285_12_OR_LATER(ah)) {

	if (AR_SREV_9285_12_OR_LATER(ah)) {

		if (!ar9285_clc(ah, chan))

			return false;

	} else {
@@ -947,7 +947,7 @@ bool ath9k_hw_init_cal(struct ath_hw *ah, struct ath9k_channel *chan) 
	}



	/* Do PA Calibration */

	if (AR_SREV_9285(ah) && AR_SREV_9285_11_OR_LATER(ah))

	if (AR_SREV_9285_11_OR_LATER(ah))

		ath9k_hw_9285_pa_cal(ah);



	/* Do NF Calibration after DC offset and other calibrations */

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

+1 −2
Original line number Diff line number Diff line
@@ -1345,8 +1345,7 @@ static int ath9k_hw_process_ini(struct ath_hw *ah, 
	if (AR_SREV_9280(ah))

		REG_WRITE_ARRAY(&ah->iniModesRxGain, modesIndex, regWrites);



	if (AR_SREV_9280(ah) || (AR_SREV_9285(ah) &&

	    AR_SREV_9285_12_OR_LATER(ah)))

	if (AR_SREV_9280(ah) || AR_SREV_9285_12_OR_LATER(ah))

		REG_WRITE_ARRAY(&ah->iniModesTxGain, modesIndex, regWrites);



	for (i = 0; i < ah->iniCommon.ia_rows; i++) {