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

Commit c24c7f58 authored by Luca Coelho's avatar Luca Coelho
Browse files

iwlwifi: trans: don't call the trans-specific ref/unref directly 



It's cleaner to always call the iwl_trans_ref/unref() functions
instead of sometimes calling the trans-specific ops directly.  This
also prepares for moving some of the code from the trans-specific ops
to the common trans code.

Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent 2b1ba3ef

drivers/net/wireless/intel/iwlwifi/pcie/internal.h

+0 −3
Original line number Diff line number Diff line
@@ -481,9 +481,6 @@ void iwl_trans_pcie_reclaim(struct iwl_trans *trans, int txq_id, int ssn, 
			    struct sk_buff_head *skbs);

void iwl_trans_pcie_tx_reset(struct iwl_trans *trans);



void iwl_trans_pcie_ref(struct iwl_trans *trans);

void iwl_trans_pcie_unref(struct iwl_trans *trans);



static inline u16 iwl_pcie_tfd_tb_get_len(struct iwl_tfd *tfd, u8 idx)

{

	struct iwl_tfd_tb *tb = &tfd->tbs[idx];

drivers/net/wireless/intel/iwlwifi/pcie/trans.c

+2 −2
Original line number Diff line number Diff line
@@ -2013,7 +2013,7 @@ static void iwl_trans_pcie_set_bits_mask(struct iwl_trans *trans, u32 reg, 
	spin_unlock_irqrestore(&trans_pcie->reg_lock, flags);

}



void iwl_trans_pcie_ref(struct iwl_trans *trans)

static void iwl_trans_pcie_ref(struct iwl_trans *trans)

{

	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
@@ -2028,7 +2028,7 @@ void iwl_trans_pcie_ref(struct iwl_trans *trans) 
#endif /* CONFIG_PM */

}



void iwl_trans_pcie_unref(struct iwl_trans *trans)

static void iwl_trans_pcie_unref(struct iwl_trans *trans)

{

	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);

drivers/net/wireless/intel/iwlwifi/pcie/tx.c

+5 −5
Original line number Diff line number Diff line
@@ -605,7 +605,7 @@ static void iwl_pcie_clear_cmd_in_flight(struct iwl_trans *trans) 
	if (trans_pcie->ref_cmd_in_flight) {

		trans_pcie->ref_cmd_in_flight = false;

		IWL_DEBUG_RPM(trans, "clear ref_cmd_in_flight - unref\n");

		iwl_trans_pcie_unref(trans);

		iwl_trans_unref(trans);

	}



	if (!trans->cfg->base_params->apmg_wake_up_wa)
@@ -650,7 +650,7 @@ static void iwl_pcie_txq_unmap(struct iwl_trans *trans, int txq_id) 
			if (txq_id != trans_pcie->cmd_queue) {

				IWL_DEBUG_RPM(trans, "Q %d - last tx freed\n",

					      q->id);

				iwl_trans_pcie_unref(trans);

				iwl_trans_unref(trans);

			} else {

				iwl_pcie_clear_cmd_in_flight(trans);

			}
@@ -1134,7 +1134,7 @@ void iwl_trans_pcie_reclaim(struct iwl_trans *trans, int txq_id, int ssn, 


	if (q->read_ptr == q->write_ptr) {

		IWL_DEBUG_RPM(trans, "Q %d - last tx reclaimed\n", q->id);

		iwl_trans_pcie_unref(trans);

		iwl_trans_unref(trans);

	}



out:
@@ -1153,7 +1153,7 @@ static int iwl_pcie_set_cmd_in_flight(struct iwl_trans *trans, 
	    !trans_pcie->ref_cmd_in_flight) {

		trans_pcie->ref_cmd_in_flight = true;

		IWL_DEBUG_RPM(trans, "set ref_cmd_in_flight - ref\n");

		iwl_trans_pcie_ref(trans);

		iwl_trans_ref(trans);

	}



	/*
@@ -2362,7 +2362,7 @@ int iwl_trans_pcie_tx(struct iwl_trans *trans, struct sk_buff *skb, 
				txq->frozen_expiry_remainder = txq->wd_timeout;

		}

		IWL_DEBUG_RPM(trans, "Q: %d first tx - take ref\n", q->id);

		iwl_trans_pcie_ref(trans);

		iwl_trans_ref(trans);

	}



	/* Tell device the write index *just past* this latest filled TFD */