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

Commit 73d7b5ac authored by Zhu, Yi's avatar Zhu, Yi Committed by John W. Linville
Browse files

iwlwifi: iwl_poll_{direct_}bit cleanup 



The patch merges implementation of iwl_poll_bit() and
iwl_poll_direct_bit() by letting the latter be a special case of
the former.

Signed-off-by: default avatarZhu Yi <yi.zhu@intel.com>
Signed-off-by: default avatarReinette Chatre <reinette.chatre@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 42802d71

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

+1 −0
Original line number Diff line number Diff line
@@ -321,6 +321,7 @@ struct iwl3945_eeprom { 
/* RSSR */

#define FH_RSSR_CTRL            (FH_RSSR_TABLE+0x000)

#define FH_RSSR_STATUS          (FH_RSSR_TABLE+0x004)

#define FH_RSSR_CHNL0_RX_STATUS_CHNL_IDLE	(0x01000000)

/* TCSR */

#define FH_TCSR(_channel)           (FH_TCSR_TABLE+(_channel)*0x20)

#define FH_TCSR_CONFIG(_channel)    (FH_TCSR(_channel)+0x00)

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

+1 −10
Original line number Diff line number Diff line
@@ -271,16 +271,7 @@ static inline void iwl3945_write_reg_buf(struct iwl3945_priv *priv, 
static inline int _iwl3945_poll_direct_bit(struct iwl3945_priv *priv,

					   u32 addr, u32 mask, int timeout)

{

	int i = 0;



	do {

		if ((_iwl3945_read_direct32(priv, addr) & mask) == mask)

			return i;

		udelay(10);

		i += 10;

	} while (i < timeout);



	return -ETIMEDOUT;

	return _iwl3945_poll_bit(priv, addr, mask, mask, timeout);

}



#ifdef CONFIG_IWL3945_DEBUG

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

+7 −9
Original line number Diff line number Diff line
@@ -1103,8 +1103,7 @@ int iwl3945_hw_nic_init(struct iwl3945_priv *priv) 
		    CSR_GIO_CHICKEN_BITS_REG_BIT_L1A_NO_L0S_RX);



	iwl3945_set_bit(priv, CSR_GP_CNTRL, CSR_GP_CNTRL_REG_FLAG_INIT_DONE);

	rc = iwl3945_poll_bit(priv, CSR_GP_CNTRL,

			  CSR_GP_CNTRL_REG_FLAG_MAC_CLOCK_READY,

	rc = iwl3945_poll_direct_bit(priv, CSR_GP_CNTRL,

			CSR_GP_CNTRL_REG_FLAG_MAC_CLOCK_READY, 25000);

	if (rc < 0) {

		spin_unlock_irqrestore(&priv->lock, flags);
@@ -1286,8 +1285,7 @@ int iwl3945_hw_nic_stop_master(struct iwl3945_priv *priv) 
		IWL_DEBUG_INFO("Card in power save, master is already "

			       "stopped\n");

	else {

		rc = iwl3945_poll_bit(priv, CSR_RESET,

				  CSR_RESET_REG_FLAG_MASTER_DISABLED,

		rc = iwl3945_poll_direct_bit(priv, CSR_RESET,

				  CSR_RESET_REG_FLAG_MASTER_DISABLED, 100);

		if (rc < 0) {

			spin_unlock_irqrestore(&priv->lock, flags);
@@ -1312,8 +1310,7 @@ int iwl3945_hw_nic_reset(struct iwl3945_priv *priv) 


	iwl3945_set_bit(priv, CSR_RESET, CSR_RESET_REG_FLAG_SW_RESET);



	rc = iwl3945_poll_bit(priv, CSR_GP_CNTRL,

			  CSR_GP_CNTRL_REG_FLAG_MAC_CLOCK_READY,

	iwl3945_poll_direct_bit(priv, CSR_GP_CNTRL,

			 CSR_GP_CNTRL_REG_FLAG_MAC_CLOCK_READY, 25000);



	rc = iwl3945_grab_nic_access(priv);
@@ -2311,7 +2308,8 @@ int iwl3945_hw_rxq_stop(struct iwl3945_priv *priv) 
	}



	iwl3945_write_direct32(priv, FH_RCSR_CONFIG(0), 0);

	rc = iwl3945_poll_direct_bit(priv, FH_RSSR_STATUS, (1 << 24), 1000);

	rc = iwl3945_poll_direct_bit(priv, FH_RSSR_STATUS,

			FH_RSSR_CHNL0_RX_STATUS_CHNL_IDLE, 1000);

	if (rc < 0)

		IWL_ERROR("Can't stop Rx DMA.\n");

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

+6 −10
Original line number Diff line number Diff line
@@ -352,8 +352,7 @@ static int iwl4965_apm_init(struct iwl_priv *priv) 
	iwl_set_bit(priv, CSR_GP_CNTRL, CSR_GP_CNTRL_REG_FLAG_INIT_DONE);



	/* wait for clock stabilization */

	ret = iwl_poll_bit(priv, CSR_GP_CNTRL,

			   CSR_GP_CNTRL_REG_FLAG_MAC_CLOCK_READY,

	ret = iwl_poll_direct_bit(priv, CSR_GP_CNTRL,

			CSR_GP_CNTRL_REG_FLAG_MAC_CLOCK_READY, 25000);

	if (ret < 0) {

		IWL_DEBUG_INFO("Failed to init the card\n");
@@ -436,8 +435,7 @@ static int iwl4965_apm_stop_master(struct iwl_priv *priv) 
	/* set stop master bit */

	iwl_set_bit(priv, CSR_RESET, CSR_RESET_REG_FLAG_STOP_MASTER);



	ret = iwl_poll_bit(priv, CSR_RESET,

				  CSR_RESET_REG_FLAG_MASTER_DISABLED,

	ret = iwl_poll_direct_bit(priv, CSR_RESET,

			CSR_RESET_REG_FLAG_MASTER_DISABLED, 100);

	if (ret < 0)

		goto out;
@@ -482,10 +480,8 @@ static int iwl4965_apm_reset(struct iwl_priv *priv) 


	iwl_set_bit(priv, CSR_GP_CNTRL, CSR_GP_CNTRL_REG_FLAG_INIT_DONE);



	ret = iwl_poll_bit(priv, CSR_GP_CNTRL,

			  CSR_GP_CNTRL_REG_FLAG_MAC_CLOCK_READY,

	ret = iwl_poll_direct_bit(priv, CSR_GP_CNTRL,

			CSR_GP_CNTRL_REG_FLAG_MAC_CLOCK_READY, 25000);



	if (ret < 0)

		goto out;

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

+5 −8
Original line number Diff line number Diff line
@@ -81,8 +81,7 @@ static int iwl5000_apm_stop_master(struct iwl_priv *priv) 
	/* set stop master bit */

	iwl_set_bit(priv, CSR_RESET, CSR_RESET_REG_FLAG_STOP_MASTER);



	ret = iwl_poll_bit(priv, CSR_RESET,

				  CSR_RESET_REG_FLAG_MASTER_DISABLED,

	ret = iwl_poll_direct_bit(priv, CSR_RESET,

				  CSR_RESET_REG_FLAG_MASTER_DISABLED, 100);

	if (ret < 0)

		goto out;
@@ -120,8 +119,7 @@ static int iwl5000_apm_init(struct iwl_priv *priv) 
	iwl_set_bit(priv, CSR_GP_CNTRL, CSR_GP_CNTRL_REG_FLAG_INIT_DONE);



	/* wait for clock stabilization */

	ret = iwl_poll_bit(priv, CSR_GP_CNTRL,

			  CSR_GP_CNTRL_REG_FLAG_MAC_CLOCK_READY,

	ret = iwl_poll_direct_bit(priv, CSR_GP_CNTRL,

			CSR_GP_CNTRL_REG_FLAG_MAC_CLOCK_READY, 25000);

	if (ret < 0) {

		IWL_DEBUG_INFO("Failed to init the card\n");
@@ -189,8 +187,7 @@ static int iwl5000_apm_reset(struct iwl_priv *priv) 
	iwl_set_bit(priv, CSR_GP_CNTRL, CSR_GP_CNTRL_REG_FLAG_INIT_DONE);



	/* wait for clock stabilization */

	ret = iwl_poll_bit(priv, CSR_GP_CNTRL,

			  CSR_GP_CNTRL_REG_FLAG_MAC_CLOCK_READY,

	ret = iwl_poll_direct_bit(priv, CSR_GP_CNTRL,

			CSR_GP_CNTRL_REG_FLAG_MAC_CLOCK_READY, 25000);

	if (ret < 0) {

		IWL_DEBUG_INFO("Failed to init the card\n");