Commit 91e17473 authored by Ian Schram's avatar Ian Schram Committed by David S. Miller
Browse files

iwlwifi: rename iwl_eeprom_aqcuire_semaphore to _acquire_ 



Correct the spelling of aqcuire.

Signed-off-by: default avatarIan Schram <ischram@telenet.be>
Signed-off-by: default avatarZhu Yi <yi.zhu@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 01ebd063

drivers/net/wireless/iwlwifi/iwl-3945.c

+1 −1
Original line number Diff line number Diff line
@@ -2302,7 +2302,7 @@ struct pci_device_id iwl_hw_card_ids[] = { 
	{0}

};



inline int iwl_eeprom_aqcuire_semaphore(struct iwl_priv *priv)

inline int iwl_eeprom_acquire_semaphore(struct iwl_priv *priv)

{

	_iwl_clear_bit(priv, CSR_EEPROM_GP, CSR_EEPROM_GP_IF_OWNER_MSK);

	return 0;

drivers/net/wireless/iwlwifi/iwl-3945.h

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 
/*

 * Forward declare iwl-3945.c functions for iwl-base.c

 */

extern int iwl_eeprom_aqcuire_semaphore(struct iwl_priv *priv);

extern int iwl_eeprom_acquire_semaphore(struct iwl_priv *priv);

extern __le32 iwl3945_get_antenna_flags(const struct iwl_priv *priv);

extern int iwl3945_init_hw_rate_table(struct iwl_priv *priv);

extern void iwl3945_reg_txpower_periodic(struct iwl_priv *priv);

drivers/net/wireless/iwlwifi/iwl-4965.c

+2 −2
Original line number Diff line number Diff line
@@ -4700,7 +4700,7 @@ struct pci_device_id iwl_hw_card_ids[] = { 
	{0}

};



int iwl_eeprom_aqcuire_semaphore(struct iwl_priv *priv)

int iwl_eeprom_acquire_semaphore(struct iwl_priv *priv)

{

	u16 count;

	int rc;
@@ -4713,7 +4713,7 @@ int iwl_eeprom_aqcuire_semaphore(struct iwl_priv *priv) 
					CSR_HW_IF_CONFIG_REG_BIT_EEPROM_OWN_SEM,

					EEPROM_SEM_TIMEOUT);

		if (rc >= 0) {

			IWL_DEBUG_IO("Aqcuired semaphore after %d tries.\n",

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

				count+1);

			return rc;

		}

drivers/net/wireless/iwlwifi/iwl-4965.h

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ struct sta_ht_info; 
/*

 * Forward declare iwl-4965.c functions for iwl-base.c

 */

extern int iwl_eeprom_aqcuire_semaphore(struct iwl_priv *priv);

extern int iwl_eeprom_acquire_semaphore(struct iwl_priv *priv);

extern void iwl_eeprom_release_semaphore(struct iwl_priv *priv);



extern int iwl4965_tx_queue_update_wr_ptr(struct iwl_priv *priv,

drivers/net/wireless/iwlwifi/iwl3945-base.c

+2 −2
Original line number Diff line number Diff line
@@ -1553,9 +1553,9 @@ int iwl_eeprom_init(struct iwl_priv *priv) 
		return -ENOENT;

	}



	rc = iwl_eeprom_aqcuire_semaphore(priv);

	rc = iwl_eeprom_acquire_semaphore(priv);

	if (rc < 0) {

		IWL_ERROR("Failed to aqcuire EEPROM semaphore.\n");

		IWL_ERROR("Failed to acquire EEPROM semaphore.\n");

		return -ENOENT;

	}