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

Commit eec373f0 authored by Emmanuel Grumbach's avatar Emmanuel Grumbach Committed by John W. Linville
Browse files

iwlwifi: s/iwlagn_unmap_tfd/iwl_unmap_tfd 



Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Reviewed-by: default avatarWey-Yi W Guy <wey-yi.w.guy@intel.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent bc2529c3

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

+8 −9
Original line number Diff line number Diff line
@@ -178,7 +178,7 @@ static inline u8 iwl_tfd_get_num_tbs(struct iwl_tfd *tfd) 
	return tfd->num_tbs & 0x1f;

}



static void iwlagn_unmap_tfd(struct iwl_trans *trans, struct iwl_cmd_meta *meta,

static void iwl_unmap_tfd(struct iwl_trans *trans, struct iwl_cmd_meta *meta,

			  struct iwl_tfd *tfd, enum dma_data_direction dma_dir)

{

	int i;
@@ -229,8 +229,8 @@ void iwl_txq_free_tfd(struct iwl_trans *trans, struct iwl_tx_queue *txq, 
	lockdep_assert_held(&txq->lock);



	/* We have only q->n_window txq->entries, but we use q->n_bd tfds */

	iwlagn_unmap_tfd(trans, &txq->entries[idx].meta,

			 &tfd_tmp[rd_ptr], dma_dir);

	iwl_unmap_tfd(trans, &txq->entries[idx].meta, &tfd_tmp[rd_ptr],

		      dma_dir);



	/* free SKB */

	if (txq->entries) {
@@ -647,7 +647,7 @@ static int iwl_enqueue_hcmd(struct iwl_trans *trans, struct iwl_host_cmd *cmd) 
					   (void *)cmd->data[i],

					   cmd->len[i], DMA_BIDIRECTIONAL);

		if (dma_mapping_error(trans->dev, phys_addr)) {

			iwlagn_unmap_tfd(trans, out_meta,

			iwl_unmap_tfd(trans, out_meta,

				      &txq->tfds[q->write_ptr],

				      DMA_BIDIRECTIONAL);

			idx = -ENOMEM;
@@ -784,8 +784,7 @@ void iwl_tx_cmd_complete(struct iwl_trans *trans, struct iwl_rx_cmd_buffer *rxb, 
	cmd = txq->entries[cmd_index].cmd;

	meta = &txq->entries[cmd_index].meta;



	iwlagn_unmap_tfd(trans, meta, &txq->tfds[index],

			 DMA_BIDIRECTIONAL);

	iwl_unmap_tfd(trans, meta, &txq->tfds[index], DMA_BIDIRECTIONAL);



	/* Input error checking is done when commands are added to queue. */

	if (meta->flags & CMD_WANT_SKB) {