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>

8 files changed, 37 insertions, 37 deletions

diff --git a/drivers/net/ethernet/broadcom/bcm63xx_enet.c b/drivers/net/ethernet/broadcom/bcm63xx_enet.c
index 6bae973d4dce..09cd188826b1 100644
--- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c
+++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c
@@ -936,7 +936,7 @@ static int bcm_enet_open(struct net_device *dev)
 
         /* allocate rx dma ring */
         size = priv->rx_ring_size * sizeof(struct bcm_enet_desc);
-        p = dma_zalloc_coherent(kdev, size, &priv->rx_desc_dma, GFP_KERNEL);
+        p = dma_alloc_coherent(kdev, size, &priv->rx_desc_dma, GFP_KERNEL);
         if (!p) {
                 ret = -ENOMEM;
                 goto out_freeirq_tx;
@@ -947,7 +947,7 @@ static int bcm_enet_open(struct net_device *dev)
 
         /* allocate tx dma ring */
         size = priv->tx_ring_size * sizeof(struct bcm_enet_desc);
-        p = dma_zalloc_coherent(kdev, size, &priv->tx_desc_dma, GFP_KERNEL);
+        p = dma_alloc_coherent(kdev, size, &priv->tx_desc_dma, GFP_KERNEL);
         if (!p) {
                 ret = -ENOMEM;
                 goto out_free_rx_ring;
@@ -2120,7 +2120,7 @@ static int bcm_enetsw_open(struct net_device *dev)
 
         /* allocate rx dma ring */
         size = priv->rx_ring_size * sizeof(struct bcm_enet_desc);
-        p = dma_zalloc_coherent(kdev, size, &priv->rx_desc_dma, GFP_KERNEL);
+        p = dma_alloc_coherent(kdev, size, &priv->rx_desc_dma, GFP_KERNEL);
         if (!p) {
                 dev_err(kdev, "cannot allocate rx ring %u\n", size);
                 ret = -ENOMEM;
@@ -2132,7 +2132,7 @@ static int bcm_enetsw_open(struct net_device *dev)
 
         /* allocate tx dma ring */
         size = priv->tx_ring_size * sizeof(struct bcm_enet_desc);
-        p = dma_zalloc_coherent(kdev, size, &priv->tx_desc_dma, GFP_KERNEL);
+        p = dma_alloc_coherent(kdev, size, &priv->tx_desc_dma, GFP_KERNEL);
         if (!p) {
                 dev_err(kdev, "cannot allocate tx ring\n");
                 ret = -ENOMEM;
diff --git a/drivers/net/ethernet/broadcom/bcmsysport.c b/drivers/net/ethernet/broadcom/bcmsysport.c
index 4574275ef445..f9521d0274b7 100644
--- a/drivers/net/ethernet/broadcom/bcmsysport.c
+++ b/drivers/net/ethernet/broadcom/bcmsysport.c
@@ -1506,8 +1506,8 @@ static int bcm_sysport_init_tx_ring(struct bcm_sysport_priv *priv,
         /* We just need one DMA descriptor which is DMA-able, since writing to
          * the port will allocate a new descriptor in its internal linked-list
          */
-        p = dma_zalloc_coherent(kdev, sizeof(struct dma_desc), &ring->desc_dma,
-                                GFP_KERNEL);
+        p = dma_alloc_coherent(kdev, sizeof(struct dma_desc), &ring->desc_dma,
+                               GFP_KERNEL);
         if (!p) {
                 netif_err(priv, hw, priv->netdev, "DMA alloc failed\n");
                 return -ENOMEM;
diff --git a/drivers/net/ethernet/broadcom/bgmac.c b/drivers/net/ethernet/broadcom/bgmac.c
index cabc8e49ad24..2d3a44c40221 100644
--- a/drivers/net/ethernet/broadcom/bgmac.c
+++ b/drivers/net/ethernet/broadcom/bgmac.c
@@ -634,9 +634,9 @@ static int bgmac_dma_alloc(struct bgmac *bgmac)
 
                 /* Alloc ring of descriptors */
                 size = BGMAC_TX_RING_SLOTS * sizeof(struct bgmac_dma_desc);
-                ring->cpu_base = dma_zalloc_coherent(dma_dev, size,
-                                                     &ring->dma_base,
-                                                     GFP_KERNEL);
+                ring->cpu_base = dma_alloc_coherent(dma_dev, size,
+                                                    &ring->dma_base,
+                                                    GFP_KERNEL);
                 if (!ring->cpu_base) {
                         dev_err(bgmac->dev, "Allocation of TX ring 0x%X failed\n",
                                 ring->mmio_base);
@@ -659,9 +659,9 @@ static int bgmac_dma_alloc(struct bgmac *bgmac)
 
                 /* Alloc ring of descriptors */
                 size = BGMAC_RX_RING_SLOTS * sizeof(struct bgmac_dma_desc);
-                ring->cpu_base = dma_zalloc_coherent(dma_dev, size,
-                                                     &ring->dma_base,
-                                                     GFP_KERNEL);
+                ring->cpu_base = dma_alloc_coherent(dma_dev, size,
+                                                    &ring->dma_base,
+                                                    GFP_KERNEL);
                 if (!ring->cpu_base) {
                         dev_err(bgmac->dev, "Allocation of RX ring 0x%X failed\n",
                                 ring->mmio_base);
diff --git a/drivers/net/ethernet/broadcom/bnx2.c b/drivers/net/ethernet/broadcom/bnx2.c
index bbb247116045..d63371d70bce 100644
--- a/drivers/net/ethernet/broadcom/bnx2.c
+++ b/drivers/net/ethernet/broadcom/bnx2.c
@@ -844,8 +844,8 @@ bnx2_alloc_stats_blk(struct net_device *dev)
                                                  BNX2_SBLK_MSIX_ALIGN_SIZE);
         bp->status_stats_size = status_blk_size +
                                 sizeof(struct statistics_block);
-        status_blk = dma_zalloc_coherent(&bp->pdev->dev, bp->status_stats_size,
-                                         &bp->status_blk_mapping, GFP_KERNEL);
+        status_blk = dma_alloc_coherent(&bp->pdev->dev, bp->status_stats_size,
+                                        &bp->status_blk_mapping, GFP_KERNEL);
         if (!status_blk)
                 return -ENOMEM;
 
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
index 3aa80da973d7..4ab6eb3baefc 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
@@ -3449,10 +3449,10 @@ alloc_ext_stats:
                         goto alloc_tx_ext_stats;
 
                 bp->hw_rx_port_stats_ext =
-                        dma_zalloc_coherent(&pdev->dev,
-                                            sizeof(struct rx_port_stats_ext),
-                                            &bp->hw_rx_port_stats_ext_map,
-                                            GFP_KERNEL);
+                        dma_alloc_coherent(&pdev->dev,
+                                           sizeof(struct rx_port_stats_ext),
+                                           &bp->hw_rx_port_stats_ext_map,
+                                           GFP_KERNEL);
                 if (!bp->hw_rx_port_stats_ext)
                         return 0;
 
@@ -3462,10 +3462,10 @@ alloc_tx_ext_stats:
 
                 if (bp->hwrm_spec_code >= 0x10902) {
                         bp->hw_tx_port_stats_ext =
-                                dma_zalloc_coherent(&pdev->dev,
-                                            sizeof(struct tx_port_stats_ext),
-                                            &bp->hw_tx_port_stats_ext_map,
-                                            GFP_KERNEL);
+                                dma_alloc_coherent(&pdev->dev,
+                                                   sizeof(struct tx_port_stats_ext),
+                                                   &bp->hw_tx_port_stats_ext_map,
+                                                   GFP_KERNEL);
                 }
                 bp->flags |= BNXT_FLAG_PORT_STATS_EXT;
         }
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_dcb.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_dcb.c
index 15c7041e937b..70775158c8c4 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt_dcb.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_dcb.c
@@ -316,8 +316,8 @@ static int bnxt_hwrm_set_dcbx_app(struct bnxt *bp, struct dcb_app *app,
 
         n = IEEE_8021QAZ_MAX_TCS;
         data_len = sizeof(*data) + sizeof(*fw_app) * n;
-        data = dma_zalloc_coherent(&bp->pdev->dev, data_len, &mapping,
-                                   GFP_KERNEL);
+        data = dma_alloc_coherent(&bp->pdev->dev, data_len, &mapping,
+                                  GFP_KERNEL);
         if (!data)
                 return -ENOMEM;
 
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c
index 140dbd62106d..7f56032e44ac 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c
@@ -85,8 +85,8 @@ static int bnxt_hwrm_nvm_req(struct bnxt *bp, u32 param_id, void *msg,
                 return -EFAULT;
         }
 
-        data_addr = dma_zalloc_coherent(&bp->pdev->dev, bytesize,
-                                        &data_dma_addr, GFP_KERNEL);
+        data_addr = dma_alloc_coherent(&bp->pdev->dev, bytesize,
+                                       &data_dma_addr, GFP_KERNEL);
         if (!data_addr)
                 return -ENOMEM;
 
diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c
index 3b1397af81f7..b1627dd5f2fd 100644
--- a/drivers/net/ethernet/broadcom/tg3.c
+++ b/drivers/net/ethernet/broadcom/tg3.c
@@ -8712,10 +8712,10 @@ static int tg3_mem_rx_acquire(struct tg3 *tp)
                 if (!i && tg3_flag(tp, ENABLE_RSS))
                         continue;
 
-                tnapi->rx_rcb = dma_zalloc_coherent(&tp->pdev->dev,
-                                                    TG3_RX_RCB_RING_BYTES(tp),
-                                                    &tnapi->rx_rcb_mapping,
-                                                    GFP_KERNEL);
+                tnapi->rx_rcb = dma_alloc_coherent(&tp->pdev->dev,
+                                                   TG3_RX_RCB_RING_BYTES(tp),
+                                                   &tnapi->rx_rcb_mapping,
+                                                   GFP_KERNEL);
                 if (!tnapi->rx_rcb)
                         goto err_out;
         }
@@ -8768,9 +8768,9 @@ static int tg3_alloc_consistent(struct tg3 *tp)
 {
         int i;
 
-        tp->hw_stats = dma_zalloc_coherent(&tp->pdev->dev,
-                                           sizeof(struct tg3_hw_stats),
-                                           &tp->stats_mapping, GFP_KERNEL);
+        tp->hw_stats = dma_alloc_coherent(&tp->pdev->dev,
+                                          sizeof(struct tg3_hw_stats),
+                                          &tp->stats_mapping, GFP_KERNEL);
         if (!tp->hw_stats)
                 goto err_out;
 
@@ -8778,10 +8778,10 @@ static int tg3_alloc_consistent(struct tg3 *tp)
                 struct tg3_napi *tnapi = &tp->napi[i];
                 struct tg3_hw_status *sblk;
 
-                tnapi->hw_status = dma_zalloc_coherent(&tp->pdev->dev,
-                                                       TG3_HW_STATUS_SIZE,
-                                                       &tnapi->status_mapping,
-                                                       GFP_KERNEL);
+                tnapi->hw_status = dma_alloc_coherent(&tp->pdev->dev,
+                                                      TG3_HW_STATUS_SIZE,
+                                                      &tnapi->status_mapping,
+                                                      GFP_KERNEL);
                 if (!tnapi->hw_status)
                         goto err_out;