Commit 0dde86b2 authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville

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: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 496bab39
...@@ -1127,8 +1127,6 @@ static void iwl_set_hw_params(struct iwl_priv *priv) ...@@ -1127,8 +1127,6 @@ static void iwl_set_hw_params(struct iwl_priv *priv)
hw_params(priv).num_ampdu_queues = hw_params(priv).num_ampdu_queues =
cfg(priv)->base_params->num_of_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; hw_params(priv).wd_timeout = cfg(priv)->base_params->wd_timeout;
/* Device-specific setup */ /* Device-specific setup */
......
...@@ -215,7 +215,7 @@ static void iwl_static_sleep_cmd(struct iwl_priv *priv, ...@@ -215,7 +215,7 @@ static void iwl_static_sleep_cmd(struct iwl_priv *priv,
else else
cmd->flags &= ~IWL_POWER_SLEEP_OVER_DTIM_MSK; 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; cmd->flags |= IWL_POWER_SHADOW_REG_ENA;
else else
cmd->flags &= ~IWL_POWER_SHADOW_REG_ENA; cmd->flags &= ~IWL_POWER_SHADOW_REG_ENA;
...@@ -301,7 +301,7 @@ static void iwl_power_fill_sleep_cmd(struct iwl_priv *priv, ...@@ -301,7 +301,7 @@ static void iwl_power_fill_sleep_cmd(struct iwl_priv *priv,
if (priv->power_data.bus_pm) if (priv->power_data.bus_pm)
cmd->flags |= IWL_POWER_PCI_PM_MSK; 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; cmd->flags |= IWL_POWER_SHADOW_REG_ENA;
else else
cmd->flags &= ~IWL_POWER_SHADOW_REG_ENA; cmd->flags &= ~IWL_POWER_SHADOW_REG_ENA;
......
...@@ -185,7 +185,6 @@ struct iwl_hw_params { ...@@ -185,7 +185,6 @@ struct iwl_hw_params {
u8 valid_tx_ant; u8 valid_tx_ant;
u8 valid_rx_ant; u8 valid_rx_ant;
u8 ht40_channel; u8 ht40_channel;
bool shadow_reg_enable;
u16 sku; u16 sku;
u32 rx_page_order; u32 rx_page_order;
u32 ct_kill_threshold; u32 ct_kill_threshold;
......
...@@ -141,7 +141,7 @@ void iwl_rx_queue_update_write_ptr(struct iwl_trans *trans, ...@@ -141,7 +141,7 @@ void iwl_rx_queue_update_write_ptr(struct iwl_trans *trans,
if (q->need_update == 0) if (q->need_update == 0)
goto exit_unlock; goto exit_unlock;
if (hw_params(trans).shadow_reg_enable) { if (cfg(trans)->base_params->shadow_reg_enable) {
/* shadow register enabled */ /* shadow register enabled */
/* Device expects a multiple of 8 */ /* Device expects a multiple of 8 */
q->write_actual = (q->write & ~0x7); q->write_actual = (q->write & ~0x7);
......
...@@ -136,7 +136,7 @@ void iwl_txq_update_write_ptr(struct iwl_trans *trans, struct iwl_tx_queue *txq) ...@@ -136,7 +136,7 @@ void iwl_txq_update_write_ptr(struct iwl_trans *trans, struct iwl_tx_queue *txq)
if (txq->need_update == 0) if (txq->need_update == 0)
return; return;
if (hw_params(trans).shadow_reg_enable) { if (cfg(trans)->base_params->shadow_reg_enable) {
/* shadow register enabled */ /* shadow register enabled */
iwl_write32(trans, HBUS_TARG_WRPTR, iwl_write32(trans, HBUS_TARG_WRPTR,
txq->q.write_ptr | (txq_id << 8)); txq->q.write_ptr | (txq_id << 8));
......
...@@ -828,7 +828,7 @@ static int iwl_nic_init(struct iwl_trans *trans) ...@@ -828,7 +828,7 @@ static int iwl_nic_init(struct iwl_trans *trans)
if (iwl_tx_init(trans)) if (iwl_tx_init(trans))
return -ENOMEM; return -ENOMEM;
if (hw_params(trans).shadow_reg_enable) { if (cfg(trans)->base_params->shadow_reg_enable) {
/* enable shadow regs in HW */ /* enable shadow regs in HW */
iwl_set_bit(trans, CSR_MAC_SHADOW_REG_CTRL, iwl_set_bit(trans, CSR_MAC_SHADOW_REG_CTRL,
0x800FFFFF); 0x800FFFFF);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment