iwlegacy: mark poll bit as unlocked function

We do not take reg_lock during poll bit, so mark it such
using underscore.

Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>

diff --git a/drivers/net/wireless/iwlegacy/iwl-3945.c b/drivers/net/wireless/iwlegacy/iwl-3945.c
index 6e2e71acbef6a0bd94547e3c6ba698d21a299e6e..8c3ae39b07385ee73cd5ff6babf4e869f6a73c14 100644 (file)
--- a/drivers/net/wireless/iwlegacy/iwl-3945.c
+++ b/drivers/net/wireless/iwlegacy/iwl-3945.c
@@ -757,7 +757,7 @@ static void il3945_set_pwr_vmain(struct il_priv *il)
                                        APMG_PS_CTRL_VAL_PWR_SRC_VAUX,
                                        ~APMG_PS_CTRL_MSK_PWR_SRC);
 
-                       il_poll_bit(il, CSR_GPIO_IN,
+                       _il_poll_bit(il, CSR_GPIO_IN,
                                     CSR_GPIO_IN_VAL_VAUX_PWR_SRC,
                                     CSR_GPIO_IN_BIT_AUX_POWER, 5000);
                }
@@ -767,7 +767,7 @@ static void il3945_set_pwr_vmain(struct il_priv *il)
                        APMG_PS_CTRL_VAL_PWR_SRC_VMAIN,
                        ~APMG_PS_CTRL_MSK_PWR_SRC);
 
-       il_poll_bit(il, CSR_GPIO_IN, CSR_GPIO_IN_VAL_VMAIN_PWR_SRC,
+       _il_poll_bit(il, CSR_GPIO_IN, CSR_GPIO_IN_VAL_VMAIN_PWR_SRC,
                     CSR_GPIO_IN_BIT_AUX_POWER, 5000);  /* uS */
 }
 

diff --git a/drivers/net/wireless/iwlegacy/iwl-4965-eeprom.c b/drivers/net/wireless/iwlegacy/iwl-4965-eeprom.c
index 016472dadf3ae8507980f89230827819dd791bde..a5192570d093cbff0e361e05c544e10f8c18f412 100644 (file)
--- a/drivers/net/wireless/iwlegacy/iwl-4965-eeprom.c
+++ b/drivers/net/wireless/iwlegacy/iwl-4965-eeprom.c
@@ -98,7 +98,7 @@ int il4965_eeprom_acquire_semaphore(struct il_priv *il)
                            CSR_HW_IF_CONFIG_REG_BIT_EEPROM_OWN_SEM);
 
                /* See if we got it */
-               ret = il_poll_bit(il, CSR_HW_IF_CONFIG_REG,
+               ret = _il_poll_bit(il, 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);

diff --git a/drivers/net/wireless/iwlegacy/iwl-core.c b/drivers/net/wireless/iwlegacy/iwl-core.c
index c5ffd91af5d0224787c619ece8da78789cdd7def..d2534fb01448a1ecfeb8b79827e9c38565194ffb 100644 (file)
--- a/drivers/net/wireless/iwlegacy/iwl-core.c
+++ b/drivers/net/wireless/iwlegacy/iwl-core.c
@@ -960,7 +960,7 @@ static int il_apm_stop_master(struct il_priv *il)
        /* stop device's busmaster DMA activity */
        il_set_bit(il, CSR_RESET, CSR_RESET_REG_FLAG_STOP_MASTER);
 
-       ret = il_poll_bit(il, CSR_RESET, CSR_RESET_REG_FLAG_MASTER_DISABLED,
+       ret = _il_poll_bit(il, CSR_RESET, CSR_RESET_REG_FLAG_MASTER_DISABLED,
                        CSR_RESET_REG_FLAG_MASTER_DISABLED, 100);
        if (ret)
                IL_WARN("Master Disable Timed Out, 100 usec\n");
@@ -1072,7 +1072,7 @@ int il_apm_init(struct il_priv *il)
         * device-internal resources is supported, e.g. il_write_prph()
         * and accesses to uCode SRAM.
         */
-       ret = il_poll_bit(il, CSR_GP_CNTRL,
+       ret = _il_poll_bit(il, CSR_GP_CNTRL,
                        CSR_GP_CNTRL_REG_FLAG_MAC_CLOCK_READY,
                        CSR_GP_CNTRL_REG_FLAG_MAC_CLOCK_READY, 25000);
        if (ret < 0) {

diff --git a/drivers/net/wireless/iwlegacy/iwl-eeprom.c b/drivers/net/wireless/iwlegacy/iwl-eeprom.c
index 26cf50699efcc3fdd6c405881f32816f3d9ec095..ba2be7b9e3794869eb56fc1773244c4d4113c904 100644 (file)
--- a/drivers/net/wireless/iwlegacy/iwl-eeprom.c
+++ b/drivers/net/wireless/iwlegacy/iwl-eeprom.c
@@ -226,7 +226,7 @@ int il_eeprom_init(struct il_priv *il)
                _il_wr(il, CSR_EEPROM_REG,
                             CSR_EEPROM_REG_MSK_ADDR & (addr << 1));
 
-               ret = il_poll_bit(il, CSR_EEPROM_REG,
+               ret = _il_poll_bit(il, CSR_EEPROM_REG,
                                          CSR_EEPROM_REG_READ_VALID_MSK,
                                          CSR_EEPROM_REG_READ_VALID_MSK,
                                          IL_EEPROM_ACCESS_TIMEOUT);

diff --git a/drivers/net/wireless/iwlegacy/iwl-io.h b/drivers/net/wireless/iwlegacy/iwl-io.h
index cdbcfde2012307418d4b61498b7c81b69245e813..7ad262e9add5a712fd940bddc657eb6bac4808b9 100644 (file)
--- a/drivers/net/wireless/iwlegacy/iwl-io.h
+++ b/drivers/net/wireless/iwlegacy/iwl-io.h
@@ -66,7 +66,6 @@ _il_poll_bit(struct il_priv *il, u32 addr,
 
        return -ETIMEDOUT;
 }
-#define il_poll_bit(p, a, b, m, t) _il_poll_bit(p, a, b, m, t)
 
 static inline void _il_set_bit(struct il_priv *il, u32 reg, u32 mask)
 {

diff --git a/drivers/net/wireless/iwlegacy/iwl4965-base.c b/drivers/net/wireless/iwlegacy/iwl4965-base.c
index a7743732a6b65a1854072f27021a697ac0f5b458..f3ec8bba7ff8c6e68d12b2daacfdf126df024494 100644 (file)
--- a/drivers/net/wireless/iwlegacy/iwl4965-base.c
+++ b/drivers/net/wireless/iwlegacy/iwl4965-base.c
@@ -1907,7 +1907,7 @@ static int il4965_set_hw_ready(struct il_priv *il)
                CSR_HW_IF_CONFIG_REG_BIT_NIC_READY);
 
        /* See if we got it */
-       ret = il_poll_bit(il, CSR_HW_IF_CONFIG_REG,
+       ret = _il_poll_bit(il, CSR_HW_IF_CONFIG_REG,
                                CSR_HW_IF_CONFIG_REG_BIT_NIC_READY,
                                CSR_HW_IF_CONFIG_REG_BIT_NIC_READY,
                                HW_READY_TIMEOUT);
@@ -1935,7 +1935,7 @@ static int il4965_prepare_card_hw(struct il_priv *il)
        il_set_bit(il, CSR_HW_IF_CONFIG_REG,
                        CSR_HW_IF_CONFIG_REG_PREPARE);
 
-       ret = il_poll_bit(il, CSR_HW_IF_CONFIG_REG,
+       ret = _il_poll_bit(il, CSR_HW_IF_CONFIG_REG,
                        ~CSR_HW_IF_CONFIG_REG_BIT_NIC_PREPARE_DONE,
                        CSR_HW_IF_CONFIG_REG_BIT_NIC_PREPARE_DONE, 150000);