Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2fd2cdfb authored by Gabor Juhos's avatar Gabor Juhos Committed by John W. Linville
Browse files

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: default avatarGabor Juhos <juhosg@openwrt.org>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent b7c0c238

drivers/net/wireless/ath/ath9k/eeprom.c

+7 −1
Original line number Diff line number Diff line
@@ -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)

{

	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,

drivers/net/wireless/ath/ath9k/eeprom_4k.c

+2 −4
Original line number Diff line number Diff line
@@ -37,11 +37,9 @@ static bool __ath9k_hw_4k_fill_eeprom(struct ath_hw *ah) 
	int addr, eep_start_loc = 64;



	for (addr = 0; addr < SIZE_EEPROM_4K; addr++) {

		if (!ath9k_hw_nvram_read(common, addr + eep_start_loc, eep_data)) {

			ath_dbg(common, EEPROM,

				"Unable to read eeprom region\n");

		if (!ath9k_hw_nvram_read(common, addr + eep_start_loc,

					 eep_data))

			return false;

		}

		eep_data++;

	}

drivers/net/wireless/ath/ath9k/eeprom_9287.c

+1 −4
Original line number Diff line number Diff line
@@ -40,11 +40,8 @@ static bool __ath9k_hw_ar9287_fill_eeprom(struct ath_hw *ah) 


	for (addr = 0; addr < SIZE_EEPROM_AR9287; addr++) {

		if (!ath9k_hw_nvram_read(common, addr + eep_start_loc,

					 eep_data)) {

			ath_dbg(common, EEPROM,

				"Unable to read eeprom region\n");

					 eep_data))

			return false;

		}

		eep_data++;

	}

drivers/net/wireless/ath/ath9k/eeprom_def.c

+1 −4
Original line number Diff line number Diff line
@@ -97,11 +97,8 @@ static bool __ath9k_hw_def_fill_eeprom(struct ath_hw *ah) 


	for (addr = 0; addr < SIZE_EEPROM_DEF; addr++) {

		if (!ath9k_hw_nvram_read(common, addr + ar5416_eep_start_loc,

					 eep_data)) {

			ath_err(ath9k_hw_common(ah),

				"Unable to read eeprom region\n");

					 eep_data))

			return false;

		}

		eep_data++;

	}

	return true;