lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

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

Signed-off-by: Senthil Balasubramanian <senthilkumar@atheros.com>
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Senthil Balasubramanian
2010-04-15 17:38:50 -04:00
committed by John W. Linville
parent 641d99217f
commit 939ad86de5
4 changed files with 1 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/net/wireless/ath/ath9k/eeprom.c
View File

@@ -257,13 +257,10 @@ int ath9k_hw_eeprom_init(struct ath_hw *ah)
int status; int status;
if (AR_SREV_9287(ah)) { if (AR_SREV_9287(ah)) {
ah->eep_map = EEP_MAP_AR9287;
ah->eep_ops = &eep_AR9287_ops; ah->eep_ops = &eep_AR9287_ops;
} else if (AR_SREV_9285(ah) || AR_SREV_9271(ah)) { } else if (AR_SREV_9285(ah) || AR_SREV_9271(ah)) {
ah->eep_map = EEP_MAP_4KBITS;
ah->eep_ops = &eep_4k_ops; ah->eep_ops = &eep_4k_ops;
} else { } else {
ah->eep_map = EEP_MAP_DEFAULT;
ah->eep_ops = &eep_def_ops; ah->eep_ops = &eep_def_ops;
} }

7
drivers/net/wireless/ath/ath9k/eeprom.h
View File

@@ -656,13 +656,6 @@ struct ath9k_country_entry {
u8 iso[3]; u8 iso[3];
}; };
enum ath9k_eep_map {
EEP_MAP_DEFAULT = 0x0,
EEP_MAP_4KBITS,
EEP_MAP_AR9287,
EEP_MAP_MAX
};
struct eeprom_ops { struct eeprom_ops {
int (*check_eeprom)(struct ath_hw *hw); int (*check_eeprom)(struct ath_hw *hw);
u32 (*get_eeprom)(struct ath_hw *hw, enum eeprom_param param); u32 (*get_eeprom)(struct ath_hw *hw, enum eeprom_param param);

2
drivers/net/wireless/ath/ath9k/hw.c
View File

@@ -946,7 +946,7 @@ static void ath9k_hw_init_eeprom_fix(struct ath_hw *ah)
struct ath_common *common = ath9k_hw_common(ah); struct ath_common *common = ath9k_hw_common(ah);
ah->need_an_top2_fixup = (ah->hw_version.devid == AR9280_DEVID_PCI) && 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->version & 0xff) > 0x0a) &&
(pBase->pwdclkind == 0); (pBase->pwdclkind == 0);

1
drivers/net/wireless/ath/ath9k/hw.h
View File

@@ -548,7 +548,6 @@ struct ath_hw {
struct ar9287_eeprom map9287; struct ar9287_eeprom map9287;
} eeprom; } eeprom;
const struct eeprom_ops *eep_ops; const struct eeprom_ops *eep_ops;
enum ath9k_eep_map eep_map;
bool sw_mgmt_crypto; bool sw_mgmt_crypto;
bool is_pciexpress; bool is_pciexpress;