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

Commit d21fa2da authored by Johannes Berg's avatar Johannes Berg
Browse files

iwlwifi: don't memset scalar values 



The dma_addr_t type is a scalar value, so it should
just be assigned, not memset.

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

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

+3 −3
Original line number Diff line number Diff line
@@ -436,7 +436,7 @@ static int iwl_pcie_rx_alloc(struct iwl_trans *trans) 
err_rb_stts:

	dma_free_coherent(dev, sizeof(__le32) * RX_QUEUE_SIZE,

			  rxq->bd, rxq->bd_dma);

	memset(&rxq->bd_dma, 0, sizeof(rxq->bd_dma));

	rxq->bd_dma = 0;

	rxq->bd = NULL;

err_bd:

	return -ENOMEM;
@@ -553,7 +553,7 @@ void iwl_pcie_rx_free(struct iwl_trans *trans) 


	dma_free_coherent(trans->dev, sizeof(__le32) * RX_QUEUE_SIZE,

			  rxq->bd, rxq->bd_dma);

	memset(&rxq->bd_dma, 0, sizeof(rxq->bd_dma));

	rxq->bd_dma = 0;

	rxq->bd = NULL;



	if (rxq->rb_stts)
@@ -562,7 +562,7 @@ void iwl_pcie_rx_free(struct iwl_trans *trans) 
				  rxq->rb_stts, rxq->rb_stts_dma);

	else

		IWL_DEBUG_INFO(trans, "Free rxq->rb_stts which is NULL\n");

	memset(&rxq->rb_stts_dma, 0, sizeof(rxq->rb_stts_dma));

	rxq->rb_stts_dma = 0;

	rxq->rb_stts = NULL;

}

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

+1 −1
Original line number Diff line number Diff line
@@ -615,7 +615,7 @@ static void iwl_pcie_txq_free(struct iwl_trans *trans, int txq_id) 
	if (txq->q.n_bd) {

		dma_free_coherent(dev, sizeof(struct iwl_tfd) *

				  txq->q.n_bd, txq->tfds, txq->q.dma_addr);

		memset(&txq->q.dma_addr, 0, sizeof(txq->q.dma_addr));

		txq->q.dma_addr = 0;

	}



	kfree(txq->entries);