Skip to content

Commit

Permalink
ath9k_hw: the eep_map is used only for AR9280 PCI card ini fixup
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Senthil Balasubramanian authored and John W. Linville committed Apr 16, 2010
1 parent 641d992 commit 939ad86
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 12 deletions.
3 changes: 0 additions & 3 deletions drivers/net/wireless/ath/ath9k/eeprom.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
7 changes: 0 additions & 7 deletions drivers/net/wireless/ath/ath9k/eeprom.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion drivers/net/wireless/ath/ath9k/hw.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
1 change: 0 additions & 1 deletion drivers/net/wireless/ath/ath9k/hw.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 939ad86

Please sign in to comment.