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

Commit 6d6e68f8 authored by Johannes Berg's avatar Johannes Berg Committed by Emmanuel Grumbach
Browse files

iwlwifi: pcie: use bool for iwl_pcie_txq_build_tfd() argument 



The 'reset' argument is clearly a boolean, so use bool instead
of u8 with 0/1 values.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
parent c43e9330

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

+7 −7
Original line number Diff line number Diff line
@@ -452,7 +452,7 @@ static void iwl_pcie_txq_free_tfd(struct iwl_trans *trans, struct iwl_txq *txq) 
}



static int iwl_pcie_txq_build_tfd(struct iwl_trans *trans, struct iwl_txq *txq,

				  dma_addr_t addr, u16 len, u8 reset)

				  dma_addr_t addr, u16 len, bool reset)

{

	struct iwl_queue *q;

	struct iwl_tfd *tfd, *tfd_tmp;
@@ -1363,7 +1363,7 @@ static int iwl_pcie_enqueue_hcmd(struct iwl_trans *trans, 
	memcpy(&txq->scratchbufs[q->write_ptr], &out_cmd->hdr, scratch_size);

	iwl_pcie_txq_build_tfd(trans, txq,

			       iwl_pcie_get_scratchbuf_dma(txq, q->write_ptr),

			       scratch_size, 1);

			       scratch_size, true);



	/* map first command fragment, if any remains */

	if (copy_size > scratch_size) {
@@ -1379,7 +1379,7 @@ static int iwl_pcie_enqueue_hcmd(struct iwl_trans *trans, 
		}



		iwl_pcie_txq_build_tfd(trans, txq, phys_addr,

				       copy_size - scratch_size, 0);

				       copy_size - scratch_size, false);

	}



	/* map the remaining (adjusted) nocopy/dup fragments */
@@ -1402,7 +1402,7 @@ static int iwl_pcie_enqueue_hcmd(struct iwl_trans *trans, 
			goto out;

		}



		iwl_pcie_txq_build_tfd(trans, txq, phys_addr, cmdlen[i], 0);

		iwl_pcie_txq_build_tfd(trans, txq, phys_addr, cmdlen[i], false);

	}



	out_meta->flags = cmd->flags;
@@ -1740,7 +1740,7 @@ int iwl_trans_pcie_tx(struct iwl_trans *trans, struct sk_buff *skb, 
	memcpy(&txq->scratchbufs[q->write_ptr], &dev_cmd->hdr,

	       IWL_HCMD_SCRATCHBUF_SIZE);

	iwl_pcie_txq_build_tfd(trans, txq, tb0_phys,

			       IWL_HCMD_SCRATCHBUF_SIZE, 1);

			       IWL_HCMD_SCRATCHBUF_SIZE, true);



	/* there must be data left over for TB1 or this code must be changed */

	BUILD_BUG_ON(sizeof(struct iwl_tx_cmd) < IWL_HCMD_SCRATCHBUF_SIZE);
@@ -1750,7 +1750,7 @@ int iwl_trans_pcie_tx(struct iwl_trans *trans, struct sk_buff *skb, 
	tb1_phys = dma_map_single(trans->dev, tb1_addr, tb1_len, DMA_TO_DEVICE);

	if (unlikely(dma_mapping_error(trans->dev, tb1_phys)))

		goto out_err;

	iwl_pcie_txq_build_tfd(trans, txq, tb1_phys, tb1_len, 0);

	iwl_pcie_txq_build_tfd(trans, txq, tb1_phys, tb1_len, false);



	/*

	 * Set up TFD's third entry to point directly to remainder
@@ -1766,7 +1766,7 @@ int iwl_trans_pcie_tx(struct iwl_trans *trans, struct sk_buff *skb, 
					   &txq->tfds[q->write_ptr]);

			goto out_err;

		}

		iwl_pcie_txq_build_tfd(trans, txq, tb2_phys, tb2_len, 0);

		iwl_pcie_txq_build_tfd(trans, txq, tb2_phys, tb2_len, false);

	}



	/* Set up entry for this TFD in Tx byte-count array */