Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 142b343f authored Aug 24, 2011 by Stanislaw Gruszka

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>

parent 841b2cca

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

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -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 */
	}		}

drivers/net/wireless/iwlegacy/iwl-4965-eeprom.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -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);

drivers/net/wireless/iwlegacy/iwl-core.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -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) {

drivers/net/wireless/iwlegacy/iwl-eeprom.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -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);

drivers/net/wireless/iwlegacy/iwl-io.h

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -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)
	{		{