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

Commit d7084da0 authored by Felix Fietkau's avatar Felix Fietkau Committed by John W. Linville
Browse files

ath9k_hw: remove dead code in the eeprom ops 



The eeprom .set_addac function is only necessary for AR9160, remove it
from eeprom_4k.c and remove the dummy function from eeprom_9287.c

Signed-off-by: default avatarFelix Fietkau <nbd@openwrt.org>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 1b8714f7

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

+2 −1
Original line number Diff line number Diff line
@@ -801,6 +801,7 @@ static int ar5008_hw_process_ini(struct ath_hw *ah, 


	/* Write ADDAC shifts */

	REG_WRITE(ah, AR_PHY_ADC_SERIAL_CTL, AR_PHY_SEL_EXTERNAL_RADIO);

	if (ah->eep_ops->set_addac)

		ah->eep_ops->set_addac(ah, chan);



	if (AR_SREV_5416_22_OR_LATER(ah)) {

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

+0 −23
Original line number Diff line number Diff line
@@ -779,28 +779,6 @@ static void ath9k_hw_4k_set_txpower(struct ath_hw *ah, 
	REGWRITE_BUFFER_FLUSH(ah);

}



static void ath9k_hw_4k_set_addac(struct ath_hw *ah,

				  struct ath9k_channel *chan)

{

	struct modal_eep_4k_header *pModal;

	struct ar5416_eeprom_4k *eep = &ah->eeprom.map4k;

	u8 biaslevel;



	if (ah->hw_version.macVersion != AR_SREV_VERSION_9160)

		return;



	if (ah->eep_ops->get_eeprom_rev(ah) < AR5416_EEP_MINOR_VER_7)

		return;



	pModal = &eep->modalHeader;



	if (pModal->xpaBiasLvl != 0xff) {

		biaslevel = pModal->xpaBiasLvl;

		INI_RA(&ah->iniAddac, 7, 1) =

		  (INI_RA(&ah->iniAddac, 7, 1) & (~0x18)) | biaslevel << 3;

	}

}



static void ath9k_hw_4k_set_gain(struct ath_hw *ah,

				 struct modal_eep_4k_header *pModal,

				 struct ar5416_eeprom_4k *eep,
@@ -1152,7 +1130,6 @@ const struct eeprom_ops eep_4k_ops = { 
	.get_eeprom_ver		= ath9k_hw_4k_get_eeprom_ver,

	.get_eeprom_rev		= ath9k_hw_4k_get_eeprom_rev,

	.set_board_values	= ath9k_hw_4k_set_board_values,

	.set_addac		= ath9k_hw_4k_set_addac,

	.set_txpower		= ath9k_hw_4k_set_txpower,

	.get_spur_channel	= ath9k_hw_4k_get_spur_channel

};

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

+0 −6
Original line number Diff line number Diff line
@@ -942,11 +942,6 @@ static void ath9k_hw_ar9287_set_txpower(struct ath_hw *ah, 
	REGWRITE_BUFFER_FLUSH(ah);

}



static void ath9k_hw_ar9287_set_addac(struct ath_hw *ah,

				      struct ath9k_channel *chan)

{

}



static void ath9k_hw_ar9287_set_board_values(struct ath_hw *ah,

					     struct ath9k_channel *chan)

{
@@ -1098,7 +1093,6 @@ const struct eeprom_ops eep_ar9287_ops = { 
	.get_eeprom_ver		= ath9k_hw_ar9287_get_eeprom_ver,

	.get_eeprom_rev		= ath9k_hw_ar9287_get_eeprom_rev,

	.set_board_values	= ath9k_hw_ar9287_set_board_values,

	.set_addac		= ath9k_hw_ar9287_set_addac,

	.set_txpower		= ath9k_hw_ar9287_set_txpower,

	.get_spur_channel	= ath9k_hw_ar9287_get_spur_channel

};