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

ath9k: remove unneeded calculation of minimal calibration power

Browse Source 
Remove tMinCalPower from ath9k_hw_set_def_power_cal_table(), as it's
never used.  Remove corresponding arguments of the functions calculating
that value.

Original patch by Prarit Bhargava <prarit@redhat.com>

Signed-off-by: Pavel Roskin <proski@gnu.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Pavel Roskin
2010-07-06 12:51:27 -04:00
committed by John W. Linville
parent 982723df56
commit 6eb90d46c5
3 changed files with 4 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/net/wireless/ath/ath9k/eeprom_4k.c
View File

@@ -222,7 +222,7 @@ static void ath9k_hw_get_4k_gain_boundaries_pdadcs(struct ath_hw *ah,
struct ath9k_channel *chan, struct ath9k_channel *chan,
struct cal_data_per_freq_4k *pRawDataSet, struct cal_data_per_freq_4k *pRawDataSet,
u8 *bChans, u16 availPiers, u8 *bChans, u16 availPiers,
u16 tPdGainOverlap, int16_t *pMinCalPower, u16 tPdGainOverlap,
u16 *pPdGainBoundaries, u8 *pPDADCValues, u16 *pPdGainBoundaries, u8 *pPDADCValues,
u16 numXpdGains) u16 numXpdGains)
{ {
@@ -308,8 +308,6 @@ static void ath9k_hw_get_4k_gain_boundaries_pdadcs(struct ath_hw *ah,
} }
} }
*pMinCalPower = (int16_t)(minPwrT4[0] / 2);
k = 0; k = 0;
for (i = 0; i < numXpdGains; i++) { for (i = 0; i < numXpdGains; i++) {
@@ -399,7 +397,6 @@ static void ath9k_hw_set_4k_power_cal_table(struct ath_hw *ah,
static u8 pdadcValues[AR5416_NUM_PDADC_VALUES]; static u8 pdadcValues[AR5416_NUM_PDADC_VALUES];
u16 gainBoundaries[AR5416_EEP4K_PD_GAINS_IN_MASK]; u16 gainBoundaries[AR5416_EEP4K_PD_GAINS_IN_MASK];
u16 numPiers, i, j; u16 numPiers, i, j;
int16_t tMinCalPower;
u16 numXpdGain, xpdMask; u16 numXpdGain, xpdMask;
u16 xpdGainValues[AR5416_EEP4K_NUM_PD_GAINS] = { 0, 0 }; u16 xpdGainValues[AR5416_EEP4K_NUM_PD_GAINS] = { 0, 0 };
u32 reg32, regOffset, regChainOffset; u32 reg32, regOffset, regChainOffset;
@@ -452,7 +449,7 @@ static void ath9k_hw_set_4k_power_cal_table(struct ath_hw *ah,
ath9k_hw_get_4k_gain_boundaries_pdadcs(ah, chan, ath9k_hw_get_4k_gain_boundaries_pdadcs(ah, chan,
pRawDataset, pCalBChans, pRawDataset, pCalBChans,
numPiers, pdGainOverlap_t2, numPiers, pdGainOverlap_t2,
&tMinCalPower, gainBoundaries, gainBoundaries,
pdadcValues, numXpdGain); pdadcValues, numXpdGain);
ENABLE_REGWRITE_BUFFER(ah); ENABLE_REGWRITE_BUFFER(ah);

4
drivers/net/wireless/ath/ath9k/eeprom_9287.c
View File

@@ -223,7 +223,6 @@ static void ath9k_hw_get_ar9287_gain_boundaries_pdadcs(struct ath_hw *ah,
struct cal_data_per_freq_ar9287 *pRawDataSet, struct cal_data_per_freq_ar9287 *pRawDataSet,
u8 *bChans, u16 availPiers, u8 *bChans, u16 availPiers,
u16 tPdGainOverlap, u16 tPdGainOverlap,
int16_t *pMinCalPower,
u16 *pPdGainBoundaries, u16 *pPdGainBoundaries,
u8 *pPDADCValues, u8 *pPDADCValues,
u16 numXpdGains) u16 numXpdGains)
@@ -303,7 +302,6 @@ static void ath9k_hw_get_ar9287_gain_boundaries_pdadcs(struct ath_hw *ah,
} }
} }
*pMinCalPower = (int16_t)(minPwrT4[0] / 2);
k = 0; k = 0;
for (i = 0; i < numXpdGains; i++) { for (i = 0; i < numXpdGains; i++) {
@@ -458,7 +456,6 @@ static void ath9k_hw_set_ar9287_power_cal_table(struct ath_hw *ah,
u8 pdadcValues[AR9287_NUM_PDADC_VALUES]; u8 pdadcValues[AR9287_NUM_PDADC_VALUES];
u16 gainBoundaries[AR9287_PD_GAINS_IN_MASK]; u16 gainBoundaries[AR9287_PD_GAINS_IN_MASK];
u16 numPiers = 0, i, j; u16 numPiers = 0, i, j;
int16_t tMinCalPower;
u16 numXpdGain, xpdMask; u16 numXpdGain, xpdMask;
u16 xpdGainValues[AR9287_NUM_PD_GAINS] = {0, 0, 0, 0}; u16 xpdGainValues[AR9287_NUM_PD_GAINS] = {0, 0, 0, 0};
u32 reg32, regOffset, regChainOffset, regval; u32 reg32, regOffset, regChainOffset, regval;
@@ -530,7 +527,6 @@ static void ath9k_hw_set_ar9287_power_cal_table(struct ath_hw *ah,
pRawDataset, pRawDataset,
pCalBChans, numPiers, pCalBChans, numPiers,
pdGainOverlap_t2, pdGainOverlap_t2,
&tMinCalPower,
gainBoundaries, gainBoundaries,
pdadcValues, pdadcValues,
numXpdGain); numXpdGain);

7
drivers/net/wireless/ath/ath9k/eeprom_def.c
View File

@@ -593,7 +593,7 @@ static void ath9k_hw_get_def_gain_boundaries_pdadcs(struct ath_hw *ah,
struct ath9k_channel *chan, struct ath9k_channel *chan,
struct cal_data_per_freq *pRawDataSet, struct cal_data_per_freq *pRawDataSet,
u8 *bChans, u16 availPiers, u8 *bChans, u16 availPiers,
u16 tPdGainOverlap, int16_t *pMinCalPower, u16 tPdGainOverlap,
u16 *pPdGainBoundaries, u8 *pPDADCValues, u16 *pPdGainBoundaries, u8 *pPDADCValues,
u16 numXpdGains) u16 numXpdGains)
{ {
@@ -675,8 +675,6 @@ static void ath9k_hw_get_def_gain_boundaries_pdadcs(struct ath_hw *ah,
} }
} }
*pMinCalPower = (int16_t)(minPwrT4[0] / 2);
k = 0; k = 0;
for (i = 0; i < numXpdGains; i++) { for (i = 0; i < numXpdGains; i++) {
@@ -838,7 +836,7 @@ static void ath9k_hw_set_def_power_cal_table(struct ath_hw *ah,
static u8 pdadcValues[AR5416_NUM_PDADC_VALUES]; static u8 pdadcValues[AR5416_NUM_PDADC_VALUES];
u16 gainBoundaries[AR5416_PD_GAINS_IN_MASK]; u16 gainBoundaries[AR5416_PD_GAINS_IN_MASK];
u16 numPiers, i, j; u16 numPiers, i, j;
int16_t tMinCalPower, diff = 0; int16_t diff = 0;
u16 numXpdGain, xpdMask; u16 numXpdGain, xpdMask;
u16 xpdGainValues[AR5416_NUM_PD_GAINS] = { 0, 0, 0, 0 }; u16 xpdGainValues[AR5416_NUM_PD_GAINS] = { 0, 0, 0, 0 };
u32 reg32, regOffset, regChainOffset; u32 reg32, regOffset, regChainOffset;
@@ -923,7 +921,6 @@ static void ath9k_hw_set_def_power_cal_table(struct ath_hw *ah,
chan, pRawDataset, chan, pRawDataset,
pCalBChans, numPiers, pCalBChans, numPiers,
pdGainOverlap_t2, pdGainOverlap_t2,
&tMinCalPower,
gainBoundaries, gainBoundaries,
pdadcValues, pdadcValues,
numXpdGain); numXpdGain);