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

Commit 02f6f659 authored by Wey-Yi Guy's avatar Wey-Yi Guy Committed by John W. Linville
Browse files

iwlagn: remove the indirection for the dma channel num 



Not needed since the driver split.

Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent e419d62d

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

+0 −1
Original line number Diff line number Diff line
@@ -125,7 +125,6 @@ static int iwl1000_hw_set_hw_params(struct iwl_priv *priv) 
			iwlagn_mod_params.num_of_queues;



	priv->hw_params.max_txq_num = priv->cfg->base_params->num_of_queues;

	priv->hw_params.dma_chnl_num = FH50_TCSR_CHNL_NUM;

	priv->hw_params.scd_bc_tbls_size =

			priv->cfg->base_params->num_of_queues *

			sizeof(struct iwlagn_scd_bc_tbl);

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

+0 −1
Original line number Diff line number Diff line
@@ -123,7 +123,6 @@ static int iwl2000_hw_set_hw_params(struct iwl_priv *priv) 
			iwlagn_mod_params.num_of_queues;



	priv->hw_params.max_txq_num = priv->cfg->base_params->num_of_queues;

	priv->hw_params.dma_chnl_num = FH50_TCSR_CHNL_NUM;

	priv->hw_params.scd_bc_tbls_size =

		priv->cfg->base_params->num_of_queues *

		sizeof(struct iwlagn_scd_bc_tbl);

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

+0 −2
Original line number Diff line number Diff line
@@ -156,7 +156,6 @@ static int iwl5000_hw_set_hw_params(struct iwl_priv *priv) 
			iwlagn_mod_params.num_of_queues;



	priv->hw_params.max_txq_num = priv->cfg->base_params->num_of_queues;

	priv->hw_params.dma_chnl_num = FH50_TCSR_CHNL_NUM;

	priv->hw_params.scd_bc_tbls_size =

			priv->cfg->base_params->num_of_queues *

			sizeof(struct iwlagn_scd_bc_tbl);
@@ -200,7 +199,6 @@ static int iwl5150_hw_set_hw_params(struct iwl_priv *priv) 
			iwlagn_mod_params.num_of_queues;



	priv->hw_params.max_txq_num = priv->cfg->base_params->num_of_queues;

	priv->hw_params.dma_chnl_num = FH50_TCSR_CHNL_NUM;

	priv->hw_params.scd_bc_tbls_size =

			priv->cfg->base_params->num_of_queues *

			sizeof(struct iwlagn_scd_bc_tbl);

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

+0 −1
Original line number Diff line number Diff line
@@ -144,7 +144,6 @@ static int iwl6000_hw_set_hw_params(struct iwl_priv *priv) 
			iwlagn_mod_params.num_of_queues;



	priv->hw_params.max_txq_num = priv->cfg->base_params->num_of_queues;

	priv->hw_params.dma_chnl_num = FH50_TCSR_CHNL_NUM;

	priv->hw_params.scd_bc_tbls_size =

			priv->cfg->base_params->num_of_queues *

			sizeof(struct iwlagn_scd_bc_tbl);

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

+1 −1
Original line number Diff line number Diff line
@@ -406,7 +406,7 @@ static int iwlagn_alive_notify(struct iwl_priv *priv) 
		       priv->scd_bc_tbls.dma >> 10);



	/* Enable DMA channel */

	for (chan = 0; chan < FH50_TCSR_CHNL_NUM ; chan++)

	for (chan = 0; chan < FH_TCSR_CHNL_NUM ; chan++)

		iwl_write_direct32(priv, FH_TCSR_CHNL_TX_CONFIG_REG(chan),

				FH_TCSR_TX_CONFIG_REG_VAL_DMA_CHNL_ENABLE |

				FH_TCSR_TX_CONFIG_REG_VAL_DMA_CREDIT_ENABLE);