aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuis R. Rodriguez <lrodriguez@atheros.com>2009-08-03 17:31:25 -0400
committerJohn W. Linville <linville@tuxdriver.com>2009-08-04 16:44:33 -0400
commit475f5989d4dc359046521cdfe9869cabf8c9fce9 (patch)
treeb2bcedefda867c0048683d13724e3f33ea4faf47
parent39068d1c2810077377fc2ffcfbe380bfbed696cb (diff)
ath9k: Remove _t postfix for ar9287_eeprom structure
We don't use typdefs on ath9k, remove that _t. Cc: Vivek Natarajan <vnatarajan@atheros.com> Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/wireless/ath/ath9k/eeprom.c20
-rw-r--r--drivers/net/wireless/ath/ath9k/eeprom.h2
-rw-r--r--drivers/net/wireless/ath/ath9k/hw.h2
3 files changed, 12 insertions, 12 deletions
diff --git a/drivers/net/wireless/ath/ath9k/eeprom.c b/drivers/net/wireless/ath/ath9k/eeprom.c
index e8ccec0dea13..80ece019216e 100644
--- a/drivers/net/wireless/ath/ath9k/eeprom.c
+++ b/drivers/net/wireless/ath/ath9k/eeprom.c
@@ -2794,7 +2794,7 @@ static int ath9k_hw_AR9287_get_eeprom_rev(struct ath_hw *ah)
2794 2794
2795static bool ath9k_hw_AR9287_fill_eeprom(struct ath_hw *ah) 2795static bool ath9k_hw_AR9287_fill_eeprom(struct ath_hw *ah)
2796{ 2796{
2797 struct ar9287_eeprom_t *eep = &ah->eeprom.map9287; 2797 struct ar9287_eeprom *eep = &ah->eeprom.map9287;
2798 u16 *eep_data; 2798 u16 *eep_data;
2799 int addr, eep_start_loc = AR9287_EEP_START_LOC; 2799 int addr, eep_start_loc = AR9287_EEP_START_LOC;
2800 eep_data = (u16 *)eep; 2800 eep_data = (u16 *)eep;
@@ -2803,7 +2803,7 @@ static bool ath9k_hw_AR9287_fill_eeprom(struct ath_hw *ah)
2803 "Reading from EEPROM, not flash\n"); 2803 "Reading from EEPROM, not flash\n");
2804 } 2804 }
2805 2805
2806 for (addr = 0; addr < sizeof(struct ar9287_eeprom_t) / sizeof(u16); 2806 for (addr = 0; addr < sizeof(struct ar9287_eeprom) / sizeof(u16);
2807 addr++) { 2807 addr++) {
2808 if (!ath9k_hw_nvram_read(ah, addr + eep_start_loc, eep_data)) { 2808 if (!ath9k_hw_nvram_read(ah, addr + eep_start_loc, eep_data)) {
2809 DPRINTF(ah->ah_sc, ATH_DBG_EEPROM, 2809 DPRINTF(ah->ah_sc, ATH_DBG_EEPROM,
@@ -2816,12 +2816,12 @@ static bool ath9k_hw_AR9287_fill_eeprom(struct ath_hw *ah)
2816} 2816}
2817static int ath9k_hw_AR9287_check_eeprom(struct ath_hw *ah) 2817static int ath9k_hw_AR9287_check_eeprom(struct ath_hw *ah)
2818{ 2818{
2819#define SIZE_EEPROM_87 (sizeof(struct ar9287_eeprom_t) / sizeof(u16)) 2819#define SIZE_EEPROM_87 (sizeof(struct ar9287_eeprom) / sizeof(u16))
2820 u32 sum = 0, el, integer; 2820 u32 sum = 0, el, integer;
2821 u16 temp, word, magic, magic2, *eepdata; 2821 u16 temp, word, magic, magic2, *eepdata;
2822 int i, addr; 2822 int i, addr;
2823 bool need_swap = false; 2823 bool need_swap = false;
2824 struct ar9287_eeprom_t *eep = &ah->eeprom.map9287; 2824 struct ar9287_eeprom *eep = &ah->eeprom.map9287;
2825 2825
2826 if (!ath9k_hw_use_flash(ah)) { 2826 if (!ath9k_hw_use_flash(ah)) {
2827 if (!ath9k_hw_nvram_read 2827 if (!ath9k_hw_nvram_read
@@ -2920,7 +2920,7 @@ static int ath9k_hw_AR9287_check_eeprom(struct ath_hw *ah)
2920static u32 ath9k_hw_AR9287_get_eeprom(struct ath_hw *ah, 2920static u32 ath9k_hw_AR9287_get_eeprom(struct ath_hw *ah,
2921 enum eeprom_param param) 2921 enum eeprom_param param)
2922{ 2922{
2923 struct ar9287_eeprom_t *eep = &ah->eeprom.map9287; 2923 struct ar9287_eeprom *eep = &ah->eeprom.map9287;
2924 struct modal_eep_ar9287_header *pModal = &eep->modalHeader; 2924 struct modal_eep_ar9287_header *pModal = &eep->modalHeader;
2925 struct base_eep_ar9287_header *pBase = &eep->baseEepHeader; 2925 struct base_eep_ar9287_header *pBase = &eep->baseEepHeader;
2926 u16 ver_minor; 2926 u16 ver_minor;
@@ -3210,7 +3210,7 @@ static void ath9k_hw_set_AR9287_power_cal_table(struct ath_hw *ah,
3210 u16 xpdGainValues[AR9287_NUM_PD_GAINS] = {0, 0, 0, 0}; 3210 u16 xpdGainValues[AR9287_NUM_PD_GAINS] = {0, 0, 0, 0};
3211 u32 reg32, regOffset, regChainOffset; 3211 u32 reg32, regOffset, regChainOffset;
3212 int16_t modalIdx, diff = 0; 3212 int16_t modalIdx, diff = 0;
3213 struct ar9287_eeprom_t *pEepData = &ah->eeprom.map9287; 3213 struct ar9287_eeprom *pEepData = &ah->eeprom.map9287;
3214 modalIdx = IS_CHAN_2GHZ(chan) ? 1 : 0; 3214 modalIdx = IS_CHAN_2GHZ(chan) ? 1 : 0;
3215 xpdMask = pEepData->modalHeader.xpdGain; 3215 xpdMask = pEepData->modalHeader.xpdGain;
3216 if ((pEepData->baseEepHeader.version & AR9287_EEP_VER_MINOR_MASK) >= 3216 if ((pEepData->baseEepHeader.version & AR9287_EEP_VER_MINOR_MASK) >=
@@ -3380,7 +3380,7 @@ static void ath9k_hw_set_AR9287_power_per_rate_table(struct ath_hw *ah,
3380 struct chan_centers centers; 3380 struct chan_centers centers;
3381 int tx_chainmask; 3381 int tx_chainmask;
3382 u16 twiceMinEdgePower; 3382 u16 twiceMinEdgePower;
3383 struct ar9287_eeprom_t *pEepData = &ah->eeprom.map9287; 3383 struct ar9287_eeprom *pEepData = &ah->eeprom.map9287;
3384 tx_chainmask = ah->txchainmask; 3384 tx_chainmask = ah->txchainmask;
3385 3385
3386 ath9k_hw_get_channel_centers(ah, chan, &centers); 3386 ath9k_hw_get_channel_centers(ah, chan, &centers);
@@ -3613,7 +3613,7 @@ static void ath9k_hw_AR9287_set_txpower(struct ath_hw *ah,
3613{ 3613{
3614#define INCREASE_MAXPOW_BY_TWO_CHAIN 6 3614#define INCREASE_MAXPOW_BY_TWO_CHAIN 6
3615#define INCREASE_MAXPOW_BY_THREE_CHAIN 10 3615#define INCREASE_MAXPOW_BY_THREE_CHAIN 10
3616 struct ar9287_eeprom_t *pEepData = &ah->eeprom.map9287; 3616 struct ar9287_eeprom *pEepData = &ah->eeprom.map9287;
3617 struct modal_eep_ar9287_header *pModal = &pEepData->modalHeader; 3617 struct modal_eep_ar9287_header *pModal = &pEepData->modalHeader;
3618 int16_t ratesArray[Ar5416RateSize]; 3618 int16_t ratesArray[Ar5416RateSize];
3619 int16_t txPowerIndexOffset = 0; 3619 int16_t txPowerIndexOffset = 0;
@@ -3776,7 +3776,7 @@ static void ath9k_hw_AR9287_set_addac(struct ath_hw *ah,
3776static void ath9k_hw_AR9287_set_board_values(struct ath_hw *ah, 3776static void ath9k_hw_AR9287_set_board_values(struct ath_hw *ah,
3777 struct ath9k_channel *chan) 3777 struct ath9k_channel *chan)
3778{ 3778{
3779 struct ar9287_eeprom_t *eep = &ah->eeprom.map9287; 3779 struct ar9287_eeprom *eep = &ah->eeprom.map9287;
3780 struct modal_eep_ar9287_header *pModal = &eep->modalHeader; 3780 struct modal_eep_ar9287_header *pModal = &eep->modalHeader;
3781 3781
3782 u16 antWrites[AR9287_ANT_16S]; 3782 u16 antWrites[AR9287_ANT_16S];
@@ -3928,7 +3928,7 @@ static u8 ath9k_hw_AR9287_get_num_ant_config(struct ath_hw *ah,
3928static u16 ath9k_hw_AR9287_get_eeprom_antenna_cfg(struct ath_hw *ah, 3928static u16 ath9k_hw_AR9287_get_eeprom_antenna_cfg(struct ath_hw *ah,
3929 struct ath9k_channel *chan) 3929 struct ath9k_channel *chan)
3930{ 3930{
3931 struct ar9287_eeprom_t *eep = &ah->eeprom.map9287; 3931 struct ar9287_eeprom *eep = &ah->eeprom.map9287;
3932 struct modal_eep_ar9287_header *pModal = &eep->modalHeader; 3932 struct modal_eep_ar9287_header *pModal = &eep->modalHeader;
3933 return pModal->antCtrlCommon & 0xFFFF; 3933 return pModal->antCtrlCommon & 0xFFFF;
3934} 3934}
diff --git a/drivers/net/wireless/ath/ath9k/eeprom.h b/drivers/net/wireless/ath/ath9k/eeprom.h
index 335098d16a71..db77e90ed9ab 100644
--- a/drivers/net/wireless/ath/ath9k/eeprom.h
+++ b/drivers/net/wireless/ath/ath9k/eeprom.h
@@ -600,7 +600,7 @@ struct ar5416_eeprom_4k {
600 u8 padding; 600 u8 padding;
601} __packed; 601} __packed;
602 602
603struct ar9287_eeprom_t { 603struct ar9287_eeprom {
604 struct base_eep_ar9287_header baseEepHeader; 604 struct base_eep_ar9287_header baseEepHeader;
605 u8 custData[AR9287_DATA_SZ]; 605 u8 custData[AR9287_DATA_SZ];
606 struct modal_eep_ar9287_header modalHeader; 606 struct modal_eep_ar9287_header modalHeader;
diff --git a/drivers/net/wireless/ath/ath9k/hw.h b/drivers/net/wireless/ath/ath9k/hw.h
index 4e717cc68cd2..9c23db146a31 100644
--- a/drivers/net/wireless/ath/ath9k/hw.h
+++ b/drivers/net/wireless/ath/ath9k/hw.h
@@ -403,7 +403,7 @@ struct ath_hw {
403 union { 403 union {
404 struct ar5416_eeprom_def def; 404 struct ar5416_eeprom_def def;
405 struct ar5416_eeprom_4k map4k; 405 struct ar5416_eeprom_4k map4k;
406 struct ar9287_eeprom_t map9287; 406 struct ar9287_eeprom map9287;
407 } eeprom; 407 } eeprom;
408 const struct eeprom_ops *eep_ops; 408 const struct eeprom_ops *eep_ops;
409 enum ath9k_eep_map eep_map; 409 enum ath9k_eep_map eep_map;