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

Commit 0dde86b2 authored Mar 06, 2012 by Johannes Berg Committed by John W. Linville Mar 07, 2012

iwlwifi: remove shadow_reg_enable from hw_params



There's no need to copy shadow_reg_enable into
hw_params since it is a pure hardware parameter
that will never change, we can access it from
the config directly.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

parent 496bab39

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

+0 −2

Original line number	Diff line number	Diff line
		@@ -1127,8 +1127,6 @@ static void iwl_set_hw_params(struct iwl_priv *priv)

		hw_params(priv).num_ampdu_queues =
		cfg(priv)->base_params->num_of_ampdu_queues;
		hw_params(priv).shadow_reg_enable =
		cfg(priv)->base_params->shadow_reg_enable;
		hw_params(priv).wd_timeout = cfg(priv)->base_params->wd_timeout;

		/* Device-specific setup */

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -215,7 +215,7 @@ static void iwl_static_sleep_cmd(struct iwl_priv *priv,
		else
		cmd->flags &= ~IWL_POWER_SLEEP_OVER_DTIM_MSK;

		if (hw_params(priv).shadow_reg_enable)
		if (cfg(priv)->base_params->shadow_reg_enable)
		cmd->flags \|= IWL_POWER_SHADOW_REG_ENA;
		else
		cmd->flags &= ~IWL_POWER_SHADOW_REG_ENA;
		@@ -301,7 +301,7 @@ static void iwl_power_fill_sleep_cmd(struct iwl_priv *priv,
		if (priv->power_data.bus_pm)
		cmd->flags \|= IWL_POWER_PCI_PM_MSK;

		if (hw_params(priv).shadow_reg_enable)
		if (cfg(priv)->base_params->shadow_reg_enable)
		cmd->flags \|= IWL_POWER_SHADOW_REG_ENA;
		else
		cmd->flags &= ~IWL_POWER_SHADOW_REG_ENA;

drivers/net/wireless/iwlwifi/iwl-shared.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -185,7 +185,6 @@ struct iwl_hw_params {
		u8 valid_tx_ant;
		u8 valid_rx_ant;
		u8 ht40_channel;
		bool shadow_reg_enable;
		u16 sku;
		u32 rx_page_order;
		u32 ct_kill_threshold;

drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -141,7 +141,7 @@ void iwl_rx_queue_update_write_ptr(struct iwl_trans *trans,
		if (q->need_update == 0)
		goto exit_unlock;

		if (hw_params(trans).shadow_reg_enable) {
		if (cfg(trans)->base_params->shadow_reg_enable) {
		/* shadow register enabled */
		/* Device expects a multiple of 8 */
		q->write_actual = (q->write & ~0x7);

drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -136,7 +136,7 @@ void iwl_txq_update_write_ptr(struct iwl_trans trans, struct iwl_tx_queue txq)
		if (txq->need_update == 0)
		return;

		if (hw_params(trans).shadow_reg_enable) {
		if (cfg(trans)->base_params->shadow_reg_enable) {
		/* shadow register enabled */
		iwl_write32(trans, HBUS_TARG_WRPTR,
		txq->q.write_ptr \| (txq_id << 8));