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

Commit 939ad86d authored by Senthil Balasubramanian's avatar Senthil Balasubramanian Committed by John W. Linville
Browse files

ath9k_hw: the eep_map is used only for AR9280 PCI card ini fixup 



We can reorganize the code in such a way that eep_map can be removed,
which makes the code more clearer.

Signed-off-by: default avatarSenthil Balasubramanian <senthilkumar@atheros.com>
Signed-off-by: default avatarFelix Fietkau <nbd@openwrt.org>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 641d9921

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

+0 −3
Original line number Diff line number Diff line
@@ -257,13 +257,10 @@ int ath9k_hw_eeprom_init(struct ath_hw *ah) 
	int status;



	if (AR_SREV_9287(ah)) {

		ah->eep_map = EEP_MAP_AR9287;

		ah->eep_ops = &eep_AR9287_ops;

	} else if (AR_SREV_9285(ah) || AR_SREV_9271(ah)) {

		ah->eep_map = EEP_MAP_4KBITS;

		ah->eep_ops = &eep_4k_ops;

	} else {

		ah->eep_map = EEP_MAP_DEFAULT;

		ah->eep_ops = &eep_def_ops;

	}

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

+0 −7
Original line number Diff line number Diff line
@@ -656,13 +656,6 @@ struct ath9k_country_entry { 
	u8 iso[3];

};



enum ath9k_eep_map {

	EEP_MAP_DEFAULT = 0x0,

	EEP_MAP_4KBITS,

	EEP_MAP_AR9287,

	EEP_MAP_MAX

};



struct eeprom_ops {

	int (*check_eeprom)(struct ath_hw *hw);

	u32 (*get_eeprom)(struct ath_hw *hw, enum eeprom_param param);

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

+1 −1
Original line number Diff line number Diff line
@@ -946,7 +946,7 @@ static void ath9k_hw_init_eeprom_fix(struct ath_hw *ah) 
	struct ath_common *common = ath9k_hw_common(ah);



	ah->need_an_top2_fixup = (ah->hw_version.devid == AR9280_DEVID_PCI) &&

				 (ah->eep_map != EEP_MAP_4KBITS) &&

				 !AR_SREV_9285(ah) && !AR_SREV_9271(ah) &&

				 ((pBase->version & 0xff) > 0x0a) &&

				 (pBase->pwdclkind == 0);

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

+0 −1
Original line number Diff line number Diff line
@@ -548,7 +548,6 @@ struct ath_hw { 
		struct ar9287_eeprom map9287;

	} eeprom;

	const struct eeprom_ops *eep_ops;

	enum ath9k_eep_map eep_map;



	bool sw_mgmt_crypto;

	bool is_pciexpress;