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

Commit 214d14d4 authored by Johannes Berg's avatar Johannes Berg Committed by Wey-Yi Guy
Browse files

iwlagn: clean up TXQ indirection 



All of these functions no longer need to be
accessed indirectly since they're shared in
all AGN devices.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
parent 3fa50738

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

+0 −4
Original line number Diff line number Diff line
@@ -171,10 +171,6 @@ static int iwl1000_hw_set_hw_params(struct iwl_priv *priv) 


static struct iwl_lib_ops iwl1000_lib = {

	.set_hw_params = iwl1000_hw_set_hw_params,

	.txq_set_sched = iwlagn_txq_set_sched,

	.txq_attach_buf_to_tfd = iwl_hw_txq_attach_buf_to_tfd,

	.txq_free_tfd = iwl_hw_txq_free_tfd,

	.txq_init = iwl_hw_tx_queue_init,

	.rx_handler_setup = iwlagn_rx_handler_setup,

	.setup_deferred_work = iwlagn_setup_deferred_work,

	.is_valid_rtc_data_addr = iwlagn_hw_valid_rtc_data_addr,

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

+0 −4
Original line number Diff line number Diff line
@@ -252,10 +252,6 @@ static int iwl2030_hw_channel_switch(struct iwl_priv *priv, 


static struct iwl_lib_ops iwl2000_lib = {

	.set_hw_params = iwl2000_hw_set_hw_params,

	.txq_set_sched = iwlagn_txq_set_sched,

	.txq_attach_buf_to_tfd = iwl_hw_txq_attach_buf_to_tfd,

	.txq_free_tfd = iwl_hw_txq_free_tfd,

	.txq_init = iwl_hw_tx_queue_init,

	.rx_handler_setup = iwlagn_rx_handler_setup,

	.setup_deferred_work = iwlagn_bt_setup_deferred_work,

	.cancel_deferred_work = iwlagn_bt_cancel_deferred_work,

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

+0 −8
Original line number Diff line number Diff line
@@ -339,10 +339,6 @@ static int iwl5000_hw_channel_switch(struct iwl_priv *priv, 


static struct iwl_lib_ops iwl5000_lib = {

	.set_hw_params = iwl5000_hw_set_hw_params,

	.txq_set_sched = iwlagn_txq_set_sched,

	.txq_attach_buf_to_tfd = iwl_hw_txq_attach_buf_to_tfd,

	.txq_free_tfd = iwl_hw_txq_free_tfd,

	.txq_init = iwl_hw_tx_queue_init,

	.rx_handler_setup = iwlagn_rx_handler_setup,

	.setup_deferred_work = iwlagn_setup_deferred_work,

	.is_valid_rtc_data_addr = iwlagn_hw_valid_rtc_data_addr,
@@ -374,10 +370,6 @@ static struct iwl_lib_ops iwl5000_lib = { 


static struct iwl_lib_ops iwl5150_lib = {

	.set_hw_params = iwl5150_hw_set_hw_params,

	.txq_set_sched = iwlagn_txq_set_sched,

	.txq_attach_buf_to_tfd = iwl_hw_txq_attach_buf_to_tfd,

	.txq_free_tfd = iwl_hw_txq_free_tfd,

	.txq_init = iwl_hw_tx_queue_init,

	.rx_handler_setup = iwlagn_rx_handler_setup,

	.setup_deferred_work = iwlagn_setup_deferred_work,

	.is_valid_rtc_data_addr = iwlagn_hw_valid_rtc_data_addr,

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

+0 −8
Original line number Diff line number Diff line
@@ -278,10 +278,6 @@ static int iwl6000_hw_channel_switch(struct iwl_priv *priv, 


static struct iwl_lib_ops iwl6000_lib = {

	.set_hw_params = iwl6000_hw_set_hw_params,

	.txq_set_sched = iwlagn_txq_set_sched,

	.txq_attach_buf_to_tfd = iwl_hw_txq_attach_buf_to_tfd,

	.txq_free_tfd = iwl_hw_txq_free_tfd,

	.txq_init = iwl_hw_tx_queue_init,

	.rx_handler_setup = iwlagn_rx_handler_setup,

	.setup_deferred_work = iwlagn_setup_deferred_work,

	.is_valid_rtc_data_addr = iwlagn_hw_valid_rtc_data_addr,
@@ -314,10 +310,6 @@ static struct iwl_lib_ops iwl6000_lib = { 


static struct iwl_lib_ops iwl6030_lib = {

	.set_hw_params = iwl6000_hw_set_hw_params,

	.txq_set_sched = iwlagn_txq_set_sched,

	.txq_attach_buf_to_tfd = iwl_hw_txq_attach_buf_to_tfd,

	.txq_free_tfd = iwl_hw_txq_free_tfd,

	.txq_init = iwl_hw_tx_queue_init,

	.rx_handler_setup = iwlagn_bt_rx_handler_setup,

	.setup_deferred_work = iwlagn_bt_setup_deferred_work,

	.cancel_deferred_work = iwlagn_bt_cancel_deferred_work,

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

+7 −9
Original line number Diff line number Diff line
@@ -750,12 +750,10 @@ int iwlagn_tx_skb(struct iwl_priv *priv, struct sk_buff *skb) 
	spin_unlock(&priv->sta_lock);



	/* Attach buffers to TFD */

	priv->cfg->ops->lib->txq_attach_buf_to_tfd(priv, txq,

						   txcmd_phys, firstlen, 1, 0);

	iwlagn_txq_attach_buf_to_tfd(priv, txq, txcmd_phys, firstlen, 1, 0);

	if (secondlen > 0)

		priv->cfg->ops->lib->txq_attach_buf_to_tfd(priv, txq,

							   phys_addr, secondlen,

							   0, 0);

		iwlagn_txq_attach_buf_to_tfd(priv, txq, phys_addr,

					     secondlen, 0, 0);



	scratch_phys = txcmd_phys + sizeof(struct iwl_cmd_header) +

				offsetof(struct iwl_tx_cmd, scratch);
@@ -911,7 +909,7 @@ int iwlagn_txq_ctx_alloc(struct iwl_priv *priv) 
	spin_lock_irqsave(&priv->lock, flags);



	/* Turn off all Tx DMA fifos */

	priv->cfg->ops->lib->txq_set_sched(priv, 0);

	iwlagn_txq_set_sched(priv, 0);



	/* Tell NIC where to find the "keep warm" buffer */

	iwl_write_direct32(priv, FH_KW_MEM_ADDR_REG, priv->kw.dma >> 4);
@@ -949,7 +947,7 @@ void iwlagn_txq_ctx_reset(struct iwl_priv *priv) 
	spin_lock_irqsave(&priv->lock, flags);



	/* Turn off all Tx DMA fifos */

	priv->cfg->ops->lib->txq_set_sched(priv, 0);

	iwlagn_txq_set_sched(priv, 0);



	/* Tell NIC where to find the "keep warm" buffer */

	iwl_write_direct32(priv, FH_KW_MEM_ADDR_REG, priv->kw.dma >> 4);
@@ -975,7 +973,7 @@ void iwlagn_txq_ctx_stop(struct iwl_priv *priv) 
	/* Turn off all Tx DMA fifos */

	spin_lock_irqsave(&priv->lock, flags);



	priv->cfg->ops->lib->txq_set_sched(priv, 0);

	iwlagn_txq_set_sched(priv, 0);



	/* Stop each Tx DMA channel, and wait for it to be idle */

	for (ch = 0; ch < priv->hw_params.dma_chnl_num; ch++) {
@@ -1258,7 +1256,7 @@ int iwlagn_tx_queue_reclaim(struct iwl_priv *priv, int txq_id, int index) 


		iwlagn_txq_inval_byte_cnt_tbl(priv, txq);



		priv->cfg->ops->lib->txq_free_tfd(priv, txq);

		iwlagn_txq_free_tfd(priv, txq);

	}

	return nfreed;

}