1 From 9f247f908d5166e16e1cc6a50b0901e0f6733410 Mon Sep 17 00:00:00 2001
2 From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
3 Date: Mon, 3 Oct 2016 00:29:10 +0200
4 Subject: [v2 PATCH 4/7] ath9k: replace eeprom_param EEP_MINOR_REV with
7 get_eeprom(ah, EEP_MINOR_REV) and get_eeprom_rev(ah) are both doing the
8 same thing: returning the EEPROM revision (12 lowest bits). Make the
9 code consistent by using get_eeprom_rev(ah) everywhere.
11 Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
13 drivers/net/wireless/ath/ath9k/ar5008_phy.c | 2 +-
14 drivers/net/wireless/ath/ath9k/ar9002_hw.c | 6 ++----
15 drivers/net/wireless/ath/ath9k/eeprom.h | 1 -
16 drivers/net/wireless/ath/ath9k/eeprom_4k.c | 5 -----
17 drivers/net/wireless/ath/ath9k/eeprom_9287.c | 6 +-----
18 drivers/net/wireless/ath/ath9k/eeprom_def.c | 2 --
19 6 files changed, 4 insertions(+), 18 deletions(-)
21 --- a/drivers/net/wireless/ath/ath9k/ar5008_phy.c
22 +++ b/drivers/net/wireless/ath/ath9k/ar5008_phy.c
23 @@ -524,7 +524,7 @@ static bool ar5008_hw_set_rf_regs(struct
26 /* Setup rf parameters */
27 - eepMinorRev = ah->eep_ops->get_eeprom(ah, EEP_MINOR_REV);
28 + eepMinorRev = ah->eep_ops->get_eeprom_rev(ah);
30 for (i = 0; i < ah->iniBank6.ia_rows; i++)
31 ah->analogBank6Data[i] = INI_RA(&ah->iniBank6, i, modesIndex);
32 --- a/drivers/net/wireless/ath/ath9k/ar9002_hw.c
33 +++ b/drivers/net/wireless/ath/ath9k/ar9002_hw.c
34 @@ -108,8 +108,7 @@ static void ar9280_20_hw_init_rxgain_ini
38 - if (ah->eep_ops->get_eeprom(ah, EEP_MINOR_REV) >=
39 - AR5416_EEP_MINOR_VER_17) {
40 + if (ah->eep_ops->get_eeprom_rev(ah) >= AR5416_EEP_MINOR_VER_17) {
41 rxgain_type = ah->eep_ops->get_eeprom(ah, EEP_RXGAIN_TYPE);
43 if (rxgain_type == AR5416_EEP_RXGAIN_13DB_BACKOFF)
44 @@ -129,8 +128,7 @@ static void ar9280_20_hw_init_rxgain_ini
46 static void ar9280_20_hw_init_txgain_ini(struct ath_hw *ah, u32 txgain_type)
48 - if (ah->eep_ops->get_eeprom(ah, EEP_MINOR_REV) >=
49 - AR5416_EEP_MINOR_VER_19) {
50 + if (ah->eep_ops->get_eeprom_rev(ah) >= AR5416_EEP_MINOR_VER_19) {
51 if (txgain_type == AR5416_EEP_TXGAIN_HIGH_POWER)
52 INIT_INI_ARRAY(&ah->iniModesTxGain,
53 ar9280Modes_high_power_tx_gain_9280_2);
54 --- a/drivers/net/wireless/ath/ath9k/eeprom.h
55 +++ b/drivers/net/wireless/ath/ath9k/eeprom.h
56 @@ -230,7 +230,6 @@ enum eeprom_param {
64 --- a/drivers/net/wireless/ath/ath9k/eeprom_4k.c
65 +++ b/drivers/net/wireless/ath/ath9k/eeprom_4k.c
66 @@ -254,9 +254,6 @@ static u32 ath9k_hw_4k_get_eeprom(struct
67 struct ar5416_eeprom_4k *eep = &ah->eeprom.map4k;
68 struct modal_eep_4k_header *pModal = &eep->modalHeader;
69 struct base_eep_header_4k *pBase = &eep->baseEepHeader;
72 - ver_minor = pBase->version & AR5416_EEP_VER_MINOR_MASK;
76 @@ -279,8 +276,6 @@ static u32 ath9k_hw_4k_get_eeprom(struct
85 --- a/drivers/net/wireless/ath/ath9k/eeprom_9287.c
86 +++ b/drivers/net/wireless/ath/ath9k/eeprom_9287.c
87 @@ -250,9 +250,7 @@ static u32 ath9k_hw_ar9287_get_eeprom(st
88 struct ar9287_eeprom *eep = &ah->eeprom.map9287;
89 struct modal_eep_ar9287_header *pModal = &eep->modalHeader;
90 struct base_eep_ar9287_header *pBase = &eep->baseEepHeader;
93 - ver_minor = pBase->version & AR9287_EEP_VER_MINOR_MASK;
94 + u16 ver_minor = ath9k_hw_ar9287_get_eeprom_rev(ah);
98 @@ -271,8 +269,6 @@ static u32 ath9k_hw_ar9287_get_eeprom(st
99 return pBase->opCapFlags;
101 return pBase->rfSilent;
102 - case EEP_MINOR_REV:
105 return pBase->txMask;
107 --- a/drivers/net/wireless/ath/ath9k/eeprom_def.c
108 +++ b/drivers/net/wireless/ath/ath9k/eeprom_def.c
109 @@ -380,8 +380,6 @@ static u32 ath9k_hw_def_get_eeprom(struc
113 - case EEP_MINOR_REV:
114 - return AR5416_VER_MASK;
116 return pBase->txMask;