diff options
author | Luis Chamberlain <mcgrof@kernel.org> | 2019-01-04 03:23:09 -0500 |
---|---|---|
committer | Christoph Hellwig <hch@lst.de> | 2019-01-08 07:58:37 -0500 |
commit | 750afb08ca71310fcf0c4e2cb1565c63b8235b60 (patch) | |
tree | 1dde3877eb4a1a0f0349786b66c3d9276ae94561 /drivers/net/ethernet/atheros/alx/main.c | |
parent | 3bd6e94bec122a951d462c239b47954cf5f36e33 (diff) |
cross-tree: phase out dma_zalloc_coherent()
We already need to zero out memory for dma_alloc_coherent(), as such
using dma_zalloc_coherent() is superflous. Phase it out.
This change was generated with the following Coccinelle SmPL patch:
@ replace_dma_zalloc_coherent @
expression dev, size, data, handle, flags;
@@
-dma_zalloc_coherent(dev, size, handle, flags)
+dma_alloc_coherent(dev, size, handle, flags)
Suggested-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>
[hch: re-ran the script on the latest tree]
Signed-off-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'drivers/net/ethernet/atheros/alx/main.c')
-rw-r--r-- | drivers/net/ethernet/atheros/alx/main.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/net/ethernet/atheros/alx/main.c b/drivers/net/ethernet/atheros/alx/main.c index c131cfc1b79d..e3538ba7d0e7 100644 --- a/drivers/net/ethernet/atheros/alx/main.c +++ b/drivers/net/ethernet/atheros/alx/main.c | |||
@@ -660,10 +660,9 @@ static int alx_alloc_rings(struct alx_priv *alx) | |||
660 | alx->num_txq + | 660 | alx->num_txq + |
661 | sizeof(struct alx_rrd) * alx->rx_ringsz + | 661 | sizeof(struct alx_rrd) * alx->rx_ringsz + |
662 | sizeof(struct alx_rfd) * alx->rx_ringsz; | 662 | sizeof(struct alx_rfd) * alx->rx_ringsz; |
663 | alx->descmem.virt = dma_zalloc_coherent(&alx->hw.pdev->dev, | 663 | alx->descmem.virt = dma_alloc_coherent(&alx->hw.pdev->dev, |
664 | alx->descmem.size, | 664 | alx->descmem.size, |
665 | &alx->descmem.dma, | 665 | &alx->descmem.dma, GFP_KERNEL); |
666 | GFP_KERNEL); | ||
667 | if (!alx->descmem.virt) | 666 | if (!alx->descmem.virt) |
668 | return -ENOMEM; | 667 | return -ENOMEM; |
669 | 668 | ||