diff options
author | Johannes Berg <johannes.berg@intel.com> | 2013-01-07 18:25:21 -0500 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2013-01-16 08:17:51 -0500 |
commit | d21fa2dad63677b5fd0c9942c0745c1e4f0832df (patch) | |
tree | 42f83744d2d13e4b9885396ddbec14292db236de /drivers/net | |
parent | abae2386d55aff1d395cdb665f03684c227a6a69 (diff) |
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: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/wireless/iwlwifi/pcie/rx.c | 6 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/pcie/tx.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/wireless/iwlwifi/pcie/rx.c b/drivers/net/wireless/iwlwifi/pcie/rx.c index 02c9016d9684..ea9e9915ad35 100644 --- a/drivers/net/wireless/iwlwifi/pcie/rx.c +++ b/drivers/net/wireless/iwlwifi/pcie/rx.c | |||
@@ -436,7 +436,7 @@ static int iwl_pcie_rx_alloc(struct iwl_trans *trans) | |||
436 | err_rb_stts: | 436 | err_rb_stts: |
437 | dma_free_coherent(dev, sizeof(__le32) * RX_QUEUE_SIZE, | 437 | dma_free_coherent(dev, sizeof(__le32) * RX_QUEUE_SIZE, |
438 | rxq->bd, rxq->bd_dma); | 438 | rxq->bd, rxq->bd_dma); |
439 | memset(&rxq->bd_dma, 0, sizeof(rxq->bd_dma)); | 439 | rxq->bd_dma = 0; |
440 | rxq->bd = NULL; | 440 | rxq->bd = NULL; |
441 | err_bd: | 441 | err_bd: |
442 | return -ENOMEM; | 442 | return -ENOMEM; |
@@ -553,7 +553,7 @@ void iwl_pcie_rx_free(struct iwl_trans *trans) | |||
553 | 553 | ||
554 | dma_free_coherent(trans->dev, sizeof(__le32) * RX_QUEUE_SIZE, | 554 | dma_free_coherent(trans->dev, sizeof(__le32) * RX_QUEUE_SIZE, |
555 | rxq->bd, rxq->bd_dma); | 555 | rxq->bd, rxq->bd_dma); |
556 | memset(&rxq->bd_dma, 0, sizeof(rxq->bd_dma)); | 556 | rxq->bd_dma = 0; |
557 | rxq->bd = NULL; | 557 | rxq->bd = NULL; |
558 | 558 | ||
559 | if (rxq->rb_stts) | 559 | if (rxq->rb_stts) |
@@ -562,7 +562,7 @@ void iwl_pcie_rx_free(struct iwl_trans *trans) | |||
562 | rxq->rb_stts, rxq->rb_stts_dma); | 562 | rxq->rb_stts, rxq->rb_stts_dma); |
563 | else | 563 | else |
564 | IWL_DEBUG_INFO(trans, "Free rxq->rb_stts which is NULL\n"); | 564 | IWL_DEBUG_INFO(trans, "Free rxq->rb_stts which is NULL\n"); |
565 | memset(&rxq->rb_stts_dma, 0, sizeof(rxq->rb_stts_dma)); | 565 | rxq->rb_stts_dma = 0; |
566 | rxq->rb_stts = NULL; | 566 | rxq->rb_stts = NULL; |
567 | } | 567 | } |
568 | 568 | ||
diff --git a/drivers/net/wireless/iwlwifi/pcie/tx.c b/drivers/net/wireless/iwlwifi/pcie/tx.c index d25fc8aaccc6..3ff3e8b72fb0 100644 --- a/drivers/net/wireless/iwlwifi/pcie/tx.c +++ b/drivers/net/wireless/iwlwifi/pcie/tx.c | |||
@@ -615,7 +615,7 @@ static void iwl_pcie_txq_free(struct iwl_trans *trans, int txq_id) | |||
615 | if (txq->q.n_bd) { | 615 | if (txq->q.n_bd) { |
616 | dma_free_coherent(dev, sizeof(struct iwl_tfd) * | 616 | dma_free_coherent(dev, sizeof(struct iwl_tfd) * |
617 | txq->q.n_bd, txq->tfds, txq->q.dma_addr); | 617 | txq->q.n_bd, txq->tfds, txq->q.dma_addr); |
618 | memset(&txq->q.dma_addr, 0, sizeof(txq->q.dma_addr)); | 618 | txq->q.dma_addr = 0; |
619 | } | 619 | } |
620 | 620 | ||
621 | kfree(txq->entries); | 621 | kfree(txq->entries); |