leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

iwlegacy: mark poll bit as unlocked function

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

Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
This commit is contained in:
Stanislaw Gruszka 2011-08-24 15:22:57 +02:00
parent 841b2ccac3
commit 142b343f6e
6 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/wireless/iwlegacy/iwl-3945.c
View File

@ -757,7 +757,7 @@ static void il3945_set_pwr_vmain(struct il_priv *il)
APMG_PS_CTRL_VAL_PWR_SRC_VAUX, APMG_PS_CTRL_VAL_PWR_SRC_VAUX,
~APMG_PS_CTRL_MSK_PWR_SRC); ~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_VAL_VAUX_PWR_SRC,
CSR_GPIO_IN_BIT_AUX_POWER, 5000); 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_VAL_PWR_SRC_VMAIN,
~APMG_PS_CTRL_MSK_PWR_SRC); ~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 */ CSR_GPIO_IN_BIT_AUX_POWER, 5000); /* uS */
} }

2
drivers/net/wireless/iwlegacy/iwl-4965-eeprom.c
View File

@ -98,7 +98,7 @@ int il4965_eeprom_acquire_semaphore(struct il_priv *il)
CSR_HW_IF_CONFIG_REG_BIT_EEPROM_OWN_SEM); CSR_HW_IF_CONFIG_REG_BIT_EEPROM_OWN_SEM);
/* See if we got it */ /* 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,
CSR_HW_IF_CONFIG_REG_BIT_EEPROM_OWN_SEM, CSR_HW_IF_CONFIG_REG_BIT_EEPROM_OWN_SEM,
EEPROM_SEM_TIMEOUT); EEPROM_SEM_TIMEOUT);

4
drivers/net/wireless/iwlegacy/iwl-core.c
View File

@ -960,7 +960,7 @@ static int il_apm_stop_master(struct il_priv *il)
/* stop device's busmaster DMA activity */ /* stop device's busmaster DMA activity */
il_set_bit(il, CSR_RESET, CSR_RESET_REG_FLAG_STOP_MASTER); 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); CSR_RESET_REG_FLAG_MASTER_DISABLED, 100);
if (ret) if (ret)
IL_WARN("Master Disable Timed Out, 100 usec\n"); 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() * device-internal resources is supported, e.g. il_write_prph()
* and accesses to uCode SRAM. * 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,
CSR_GP_CNTRL_REG_FLAG_MAC_CLOCK_READY, 25000); CSR_GP_CNTRL_REG_FLAG_MAC_CLOCK_READY, 25000);
if (ret < 0) { if (ret < 0) {

2
drivers/net/wireless/iwlegacy/iwl-eeprom.c
View File

@ -226,7 +226,7 @@ int il_eeprom_init(struct il_priv *il)
_il_wr(il, CSR_EEPROM_REG, _il_wr(il, CSR_EEPROM_REG,
CSR_EEPROM_REG_MSK_ADDR & (addr << 1)); 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,
CSR_EEPROM_REG_READ_VALID_MSK, CSR_EEPROM_REG_READ_VALID_MSK,
IL_EEPROM_ACCESS_TIMEOUT); IL_EEPROM_ACCESS_TIMEOUT);

1
drivers/net/wireless/iwlegacy/iwl-io.h
View File

@ -66,7 +66,6 @@ _il_poll_bit(struct il_priv *il, u32 addr,
return -ETIMEDOUT; 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) static inline void _il_set_bit(struct il_priv *il, u32 reg, u32 mask)
{ {

4
drivers/net/wireless/iwlegacy/iwl4965-base.c
View File

@ -1907,7 +1907,7 @@ static int il4965_set_hw_ready(struct il_priv *il)
CSR_HW_IF_CONFIG_REG_BIT_NIC_READY); CSR_HW_IF_CONFIG_REG_BIT_NIC_READY);
/* See if we got it */ /* 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,
CSR_HW_IF_CONFIG_REG_BIT_NIC_READY, CSR_HW_IF_CONFIG_REG_BIT_NIC_READY,
HW_READY_TIMEOUT); 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, il_set_bit(il, CSR_HW_IF_CONFIG_REG,
CSR_HW_IF_CONFIG_REG_PREPARE); 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,
CSR_HW_IF_CONFIG_REG_BIT_NIC_PREPARE_DONE, 150000); CSR_HW_IF_CONFIG_REG_BIT_NIC_PREPARE_DONE, 150000);