aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-3945.c2
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-3945.h2
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-4965.c4
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-4965.h2
-rw-r--r--drivers/net/wireless/iwlwifi/iwl3945-base.c4
-rw-r--r--drivers/net/wireless/iwlwifi/iwl4965-base.c4
6 files changed, 9 insertions, 9 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-3945.c b/drivers/net/wireless/iwlwifi/iwl-3945.c
index 3a45fe99a83e..d6112816bada 100644
--- a/drivers/net/wireless/iwlwifi/iwl-3945.c
+++ b/drivers/net/wireless/iwlwifi/iwl-3945.c
@@ -2302,7 +2302,7 @@ struct pci_device_id iwl_hw_card_ids[] = {
2302 {0} 2302 {0}
2303}; 2303};
2304 2304
2305inline int iwl_eeprom_aqcuire_semaphore(struct iwl_priv *priv) 2305inline int iwl_eeprom_acquire_semaphore(struct iwl_priv *priv)
2306{ 2306{
2307 _iwl_clear_bit(priv, CSR_EEPROM_GP, CSR_EEPROM_GP_IF_OWNER_MSK); 2307 _iwl_clear_bit(priv, CSR_EEPROM_GP, CSR_EEPROM_GP_IF_OWNER_MSK);
2308 return 0; 2308 return 0;
diff --git a/drivers/net/wireless/iwlwifi/iwl-3945.h b/drivers/net/wireless/iwlwifi/iwl-3945.h
index 813902e9f8c2..2bc5e9a79be5 100644
--- a/drivers/net/wireless/iwlwifi/iwl-3945.h
+++ b/drivers/net/wireless/iwlwifi/iwl-3945.h
@@ -30,7 +30,7 @@
30/* 30/*
31 * Forward declare iwl-3945.c functions for iwl-base.c 31 * Forward declare iwl-3945.c functions for iwl-base.c
32 */ 32 */
33extern int iwl_eeprom_aqcuire_semaphore(struct iwl_priv *priv); 33extern int iwl_eeprom_acquire_semaphore(struct iwl_priv *priv);
34extern __le32 iwl3945_get_antenna_flags(const struct iwl_priv *priv); 34extern __le32 iwl3945_get_antenna_flags(const struct iwl_priv *priv);
35extern int iwl3945_init_hw_rate_table(struct iwl_priv *priv); 35extern int iwl3945_init_hw_rate_table(struct iwl_priv *priv);
36extern void iwl3945_reg_txpower_periodic(struct iwl_priv *priv); 36extern void iwl3945_reg_txpower_periodic(struct iwl_priv *priv);
diff --git a/drivers/net/wireless/iwlwifi/iwl-4965.c b/drivers/net/wireless/iwlwifi/iwl-4965.c
index 02708c7ee51c..7ff8f72d482d 100644
--- a/drivers/net/wireless/iwlwifi/iwl-4965.c
+++ b/drivers/net/wireless/iwlwifi/iwl-4965.c
@@ -4700,7 +4700,7 @@ struct pci_device_id iwl_hw_card_ids[] = {
4700 {0} 4700 {0}
4701}; 4701};
4702 4702
4703int iwl_eeprom_aqcuire_semaphore(struct iwl_priv *priv) 4703int iwl_eeprom_acquire_semaphore(struct iwl_priv *priv)
4704{ 4704{
4705 u16 count; 4705 u16 count;
4706 int rc; 4706 int rc;
@@ -4713,7 +4713,7 @@ int iwl_eeprom_aqcuire_semaphore(struct iwl_priv *priv)
4713 CSR_HW_IF_CONFIG_REG_BIT_EEPROM_OWN_SEM, 4713 CSR_HW_IF_CONFIG_REG_BIT_EEPROM_OWN_SEM,
4714 EEPROM_SEM_TIMEOUT); 4714 EEPROM_SEM_TIMEOUT);
4715 if (rc >= 0) { 4715 if (rc >= 0) {
4716 IWL_DEBUG_IO("Aqcuired semaphore after %d tries.\n", 4716 IWL_DEBUG_IO("Acquired semaphore after %d tries.\n",
4717 count+1); 4717 count+1);
4718 return rc; 4718 return rc;
4719 } 4719 }
diff --git a/drivers/net/wireless/iwlwifi/iwl-4965.h b/drivers/net/wireless/iwlwifi/iwl-4965.h
index 4c700812b45b..b31a7e4b7d78 100644
--- a/drivers/net/wireless/iwlwifi/iwl-4965.h
+++ b/drivers/net/wireless/iwlwifi/iwl-4965.h
@@ -32,7 +32,7 @@ struct sta_ht_info;
32/* 32/*
33 * Forward declare iwl-4965.c functions for iwl-base.c 33 * Forward declare iwl-4965.c functions for iwl-base.c
34 */ 34 */
35extern int iwl_eeprom_aqcuire_semaphore(struct iwl_priv *priv); 35extern int iwl_eeprom_acquire_semaphore(struct iwl_priv *priv);
36extern void iwl_eeprom_release_semaphore(struct iwl_priv *priv); 36extern void iwl_eeprom_release_semaphore(struct iwl_priv *priv);
37 37
38extern int iwl4965_tx_queue_update_wr_ptr(struct iwl_priv *priv, 38extern int iwl4965_tx_queue_update_wr_ptr(struct iwl_priv *priv,
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c
index 60e25464cee4..4fd9eac6516c 100644
--- a/drivers/net/wireless/iwlwifi/iwl3945-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c
@@ -1553,9 +1553,9 @@ int iwl_eeprom_init(struct iwl_priv *priv)
1553 return -ENOENT; 1553 return -ENOENT;
1554 } 1554 }
1555 1555
1556 rc = iwl_eeprom_aqcuire_semaphore(priv); 1556 rc = iwl_eeprom_acquire_semaphore(priv);
1557 if (rc < 0) { 1557 if (rc < 0) {
1558 IWL_ERROR("Failed to aqcuire EEPROM semaphore.\n"); 1558 IWL_ERROR("Failed to acquire EEPROM semaphore.\n");
1559 return -ENOENT; 1559 return -ENOENT;
1560 } 1560 }
1561 1561
diff --git a/drivers/net/wireless/iwlwifi/iwl4965-base.c b/drivers/net/wireless/iwlwifi/iwl4965-base.c
index 1fe05402080c..eb2d7a555bbc 100644
--- a/drivers/net/wireless/iwlwifi/iwl4965-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl4965-base.c
@@ -1602,9 +1602,9 @@ int iwl_eeprom_init(struct iwl_priv *priv)
1602 return -ENOENT; 1602 return -ENOENT;
1603 } 1603 }
1604 1604
1605 rc = iwl_eeprom_aqcuire_semaphore(priv); 1605 rc = iwl_eeprom_acquire_semaphore(priv);
1606 if (rc < 0) { 1606 if (rc < 0) {
1607 IWL_ERROR("Failed to aqcuire EEPROM semaphore.\n"); 1607 IWL_ERROR("Failed to acquire EEPROM semaphore.\n");
1608 return -ENOENT; 1608 return -ENOENT;
1609 } 1609 }
1610 1610