]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
RDMA/hns: prefer dma_zalloc_coherent to dma_alloc_coherent/memse
authorAllen Pais <allen.pais@oracle.com>
Mon, 22 Oct 2018 14:00:43 +0000 (19:30 +0530)
committerDoug Ledford <dledford@redhat.com>
Tue, 6 Nov 2018 20:58:02 +0000 (15:58 -0500)
This is a mechanical transformation, no change in logic.

Signed-off-by: Allen Pais <allen.lkml@gmail.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>
drivers/infiniband/hw/hns/hns_roce_hw_v2.c

index a4c62ae23a9aeee22213b8f799e4e796ae953e1b..d4609e7eb3c0cd3d71a072f62a8fe7b332faf6d4 100644 (file)
@@ -4972,13 +4972,12 @@ static int hns_roce_mhop_alloc_eq(struct hns_roce_dev *hr_dev,
                                eqe_alloc = i * (buf_chk_sz / eq->eqe_size);
                                size = (eq->entries - eqe_alloc) * eq->eqe_size;
                        }
-                       eq->buf[i] = dma_alloc_coherent(dev, size,
+                       eq->buf[i] = dma_zalloc_coherent(dev, size,
                                                        &(eq->buf_dma[i]),
                                                        GFP_KERNEL);
                        if (!eq->buf[i])
                                goto err_dma_alloc_buf;
 
-                       memset(eq->buf[i], 0, size);
                        *(eq->bt_l0 + i) = eq->buf_dma[i];
 
                        eq_buf_cnt++;
@@ -5008,13 +5007,12 @@ static int hns_roce_mhop_alloc_eq(struct hns_roce_dev *hr_dev,
                                        size = (eq->entries - eqe_alloc)
                                                * eq->eqe_size;
                                }
-                               eq->buf[idx] = dma_alloc_coherent(dev, size,
+                               eq->buf[idx] = dma_zalloc_coherent(dev, size,
                                                            &(eq->buf_dma[idx]),
                                                            GFP_KERNEL);
                                if (!eq->buf[idx])
                                        goto err_dma_alloc_buf;
 
-                               memset(eq->buf[idx], 0, size);
                                *(eq->bt_l1[i] + j) = eq->buf_dma[idx];
 
                                eq_buf_cnt++;
@@ -5124,7 +5122,7 @@ static int hns_roce_v2_create_eq(struct hns_roce_dev *hr_dev,
                        goto free_cmd_mbox;
                }
 
-               eq->buf_list->buf = dma_alloc_coherent(dev, buf_chk_sz,
+               eq->buf_list->buf = dma_zalloc_coherent(dev, buf_chk_sz,
                                                       &(eq->buf_list->map),
                                                       GFP_KERNEL);
                if (!eq->buf_list->buf) {
@@ -5132,7 +5130,6 @@ static int hns_roce_v2_create_eq(struct hns_roce_dev *hr_dev,
                        goto err_alloc_buf;
                }
 
-               memset(eq->buf_list->buf, 0, buf_chk_sz);
        } else {
                ret = hns_roce_mhop_alloc_eq(hr_dev, eq);
                if (ret) {