Commit 4a8513fe authored by Johannes Berg's avatar Johannes Berg Committed by Luca Coelho
Browse files

iwlwifi: eeprom: clean up macros 



There are two versions of the same definitions, with and without
IWL_ prefix. Use the ones with IWL_ prefix, keeping the correct
comment (microseconds).

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
Link: https://lore.kernel.org/r/iwlwifi.20220204122220.2150362427bd.I47a47d0f795dc08361958833b8235ab5de75d154@changeid


Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent 8ea28f13

drivers/net/wireless/intel/iwlwifi/iwl-eeprom-read.c

+4 −8
Original line number Diff line number Diff line
@@ -23,26 +23,22 @@ 
 */

#define IWL_EEPROM_ACCESS_TIMEOUT	5000 /* uSec */



#define IWL_EEPROM_SEM_TIMEOUT		10   /* microseconds */

#define IWL_EEPROM_SEM_RETRY_LIMIT	1000 /* number of attempts (not time) */





/*

 * The device's EEPROM semaphore prevents conflicts between driver and uCode

 * when accessing the EEPROM; each access is a series of pulses to/from the

 * EEPROM chip, not a single event, so even reads could conflict if they

 * weren't arbitrated by the semaphore.

 */

#define IWL_EEPROM_SEM_TIMEOUT		10   /* microseconds */

#define IWL_EEPROM_SEM_RETRY_LIMIT	1000 /* number of attempts (not time) */



#define	EEPROM_SEM_TIMEOUT 10		/* milliseconds */

#define EEPROM_SEM_RETRY_LIMIT 1000	/* number of attempts (not time) */



static int iwl_eeprom_acquire_semaphore(struct iwl_trans *trans)

{

	u16 count;

	int ret;



	for (count = 0; count < EEPROM_SEM_RETRY_LIMIT; count++) {

	for (count = 0; count < IWL_EEPROM_SEM_RETRY_LIMIT; count++) {

		/* Request semaphore */

		iwl_set_bit(trans, CSR_HW_IF_CONFIG_REG,

			    CSR_HW_IF_CONFIG_REG_BIT_EEPROM_OWN_SEM);
@@ -51,7 +47,7 @@ static int iwl_eeprom_acquire_semaphore(struct iwl_trans *trans) 
		ret = iwl_poll_bit(trans, CSR_HW_IF_CONFIG_REG,

				CSR_HW_IF_CONFIG_REG_BIT_EEPROM_OWN_SEM,

				CSR_HW_IF_CONFIG_REG_BIT_EEPROM_OWN_SEM,

				EEPROM_SEM_TIMEOUT);

				IWL_EEPROM_SEM_TIMEOUT);

		if (ret >= 0) {

			IWL_DEBUG_EEPROM(trans->dev,

					 "Acquired semaphore after %d tries.\n",