pci_alloc_consistent calls dma_alloc_coherent directly.
In commit 518a2f1925c3
("dma-mapping: zero memory returned from dma_alloc_*"),
dma_alloc_coherent has already zeroed the memory.
So memset is not needed.

Signed-off-by: Fuqian Huang <huangfq.dax...@gmail.com>
---
Changes in v3:
  - Use actual commit rather than the merge commit in the commit message

 drivers/net/hippi/rrunner.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/drivers/net/hippi/rrunner.c b/drivers/net/hippi/rrunner.c
index 7b9350dbebdd..2a6ec5394966 100644
--- a/drivers/net/hippi/rrunner.c
+++ b/drivers/net/hippi/rrunner.c
@@ -1196,7 +1196,6 @@ static int rr_open(struct net_device *dev)
                goto error;
        }
        rrpriv->rx_ctrl_dma = dma_addr;
-       memset(rrpriv->rx_ctrl, 0, 256*sizeof(struct ring_ctrl));
 
        rrpriv->info = pci_alloc_consistent(pdev, sizeof(struct rr_info),
                                            &dma_addr);
@@ -1205,7 +1204,6 @@ static int rr_open(struct net_device *dev)
                goto error;
        }
        rrpriv->info_dma = dma_addr;
-       memset(rrpriv->info, 0, sizeof(struct rr_info));
        wmb();
 
        spin_lock_irqsave(&rrpriv->lock, flags);
-- 
2.11.0

Reply via email to