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>

2 files changed, 10 insertions, 10 deletions

diff --git a/drivers/dma/xilinx/xilinx_dma.c b/drivers/dma/xilinx/xilinx_dma.c
index 02880963092f..cb20b411493e 100644
--- a/drivers/dma/xilinx/xilinx_dma.c
+++ b/drivers/dma/xilinx/xilinx_dma.c
@@ -879,10 +879,9 @@ static int xilinx_dma_alloc_chan_resources(struct dma_chan *dchan)
          */
         if (chan->xdev->dma_config->dmatype == XDMA_TYPE_AXIDMA) {
                 /* Allocate the buffer descriptors. */
-                chan->seg_v = dma_zalloc_coherent(chan->dev,
-                                                  sizeof(*chan->seg_v) *
-                                                  XILINX_DMA_NUM_DESCS,
-                                                  &chan->seg_p, GFP_KERNEL);
+                chan->seg_v = dma_alloc_coherent(chan->dev,
+                                                 sizeof(*chan->seg_v) * XILINX_DMA_NUM_DESCS,
+                                                 &chan->seg_p, GFP_KERNEL);
                 if (!chan->seg_v) {
                         dev_err(chan->dev,
                                 "unable to allocate channel %d descriptors\n",
@@ -895,9 +894,10 @@ static int xilinx_dma_alloc_chan_resources(struct dma_chan *dchan)
                  * so allocating a desc segment during channel allocation for
                  * programming tail descriptor.
                  */
-                chan->cyclic_seg_v = dma_zalloc_coherent(chan->dev,
-                                        sizeof(*chan->cyclic_seg_v),
-                                        &chan->cyclic_seg_p, GFP_KERNEL);
+                chan->cyclic_seg_v = dma_alloc_coherent(chan->dev,
+                                                        sizeof(*chan->cyclic_seg_v),
+                                                        &chan->cyclic_seg_p,
+                                                        GFP_KERNEL);
                 if (!chan->cyclic_seg_v) {
                         dev_err(chan->dev,
                                 "unable to allocate desc segment for cyclic DMA\n");
diff --git a/drivers/dma/xilinx/zynqmp_dma.c b/drivers/dma/xilinx/zynqmp_dma.c
index 8db51750ce93..4478787a247f 100644
--- a/drivers/dma/xilinx/zynqmp_dma.c
+++ b/drivers/dma/xilinx/zynqmp_dma.c
@@ -490,9 +490,9 @@ static int zynqmp_dma_alloc_chan_resources(struct dma_chan *dchan)
                 list_add_tail(&desc->node, &chan->free_list);
         }
 
-        chan->desc_pool_v = dma_zalloc_coherent(chan->dev,
-                                (2 * chan->desc_size * ZYNQMP_DMA_NUM_DESCS),
-                                &chan->desc_pool_p, GFP_KERNEL);
+        chan->desc_pool_v = dma_alloc_coherent(chan->dev,
+                                               (2 * chan->desc_size * ZYNQMP_DMA_NUM_DESCS),
+                                               &chan->desc_pool_p, GFP_KERNEL);
         if (!chan->desc_pool_v)
                 return -ENOMEM;