mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-01 22:54:01 +00:00
ath9k: move duplicated debug message to 'ath9k_hw_nvram_read'
The fill_eeprom functions are printing the same debug message in case the 'ath9k_hw_nvram_read' function fails. Remove the duplicated code from fill_eeprom functions and add the ath_dbg call directly into 'ath9k_hw_nvram_read'. Signed-off-by: Gabor Juhos <juhosg@openwrt.org> Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
parent
b7c0c23889
commit
2fd2cdfb6d
4 changed files with 11 additions and 13 deletions
|
@ -115,7 +115,13 @@ void ath9k_hw_usb_gen_fill_eeprom(struct ath_hw *ah, u16 *eep_data,
|
||||||
|
|
||||||
bool ath9k_hw_nvram_read(struct ath_common *common, u32 off, u16 *data)
|
bool ath9k_hw_nvram_read(struct ath_common *common, u32 off, u16 *data)
|
||||||
{
|
{
|
||||||
return common->bus_ops->eeprom_read(common, off, data);
|
bool ret;
|
||||||
|
|
||||||
|
ret = common->bus_ops->eeprom_read(common, off, data);
|
||||||
|
if (!ret)
|
||||||
|
ath_dbg(common, EEPROM, "Unable to read eeprom region\n");
|
||||||
|
|
||||||
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
void ath9k_hw_fill_vpd_table(u8 pwrMin, u8 pwrMax, u8 *pPwrList,
|
void ath9k_hw_fill_vpd_table(u8 pwrMin, u8 pwrMax, u8 *pPwrList,
|
||||||
|
|
|
@ -37,11 +37,9 @@ static bool __ath9k_hw_4k_fill_eeprom(struct ath_hw *ah)
|
||||||
int addr, eep_start_loc = 64;
|
int addr, eep_start_loc = 64;
|
||||||
|
|
||||||
for (addr = 0; addr < SIZE_EEPROM_4K; addr++) {
|
for (addr = 0; addr < SIZE_EEPROM_4K; addr++) {
|
||||||
if (!ath9k_hw_nvram_read(common, addr + eep_start_loc, eep_data)) {
|
if (!ath9k_hw_nvram_read(common, addr + eep_start_loc,
|
||||||
ath_dbg(common, EEPROM,
|
eep_data))
|
||||||
"Unable to read eeprom region\n");
|
|
||||||
return false;
|
return false;
|
||||||
}
|
|
||||||
eep_data++;
|
eep_data++;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -40,11 +40,8 @@ static bool __ath9k_hw_ar9287_fill_eeprom(struct ath_hw *ah)
|
||||||
|
|
||||||
for (addr = 0; addr < SIZE_EEPROM_AR9287; addr++) {
|
for (addr = 0; addr < SIZE_EEPROM_AR9287; addr++) {
|
||||||
if (!ath9k_hw_nvram_read(common, addr + eep_start_loc,
|
if (!ath9k_hw_nvram_read(common, addr + eep_start_loc,
|
||||||
eep_data)) {
|
eep_data))
|
||||||
ath_dbg(common, EEPROM,
|
|
||||||
"Unable to read eeprom region\n");
|
|
||||||
return false;
|
return false;
|
||||||
}
|
|
||||||
eep_data++;
|
eep_data++;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -97,11 +97,8 @@ static bool __ath9k_hw_def_fill_eeprom(struct ath_hw *ah)
|
||||||
|
|
||||||
for (addr = 0; addr < SIZE_EEPROM_DEF; addr++) {
|
for (addr = 0; addr < SIZE_EEPROM_DEF; addr++) {
|
||||||
if (!ath9k_hw_nvram_read(common, addr + ar5416_eep_start_loc,
|
if (!ath9k_hw_nvram_read(common, addr + ar5416_eep_start_loc,
|
||||||
eep_data)) {
|
eep_data))
|
||||||
ath_err(ath9k_hw_common(ah),
|
|
||||||
"Unable to read eeprom region\n");
|
|
||||||
return false;
|
return false;
|
||||||
}
|
|
||||||
eep_data++;
|
eep_data++;
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
|
|
Loading…
Reference in a new issue