IB/hns: Use zeroing memory allocator instead of allocator/memset

Use dma_zalloc_coherent for allocating zeroed memory and
remove unnecessary memset function.

Signed-off-by: YueHaibing <yuehaibing@huawei.com>
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>

diff --git a/drivers/infiniband/hw/hns/hns_roce_alloc.c b/drivers/infiniband/hw/hns/hns_roce_alloc.c
index a40ec939ece58236cfcbbf285fb2a389b23ccadc..46f65f9f59d0a654a3ff137dea657387c948eecf 100644 (file)
--- a/drivers/infiniband/hw/hns/hns_roce_alloc.c
+++ b/drivers/infiniband/hw/hns/hns_roce_alloc.c
@@ -197,7 +197,8 @@ int hns_roce_buf_alloc(struct hns_roce_dev *hr_dev, u32 size, u32 max_direct,
                buf->npages = 1 << order;
                buf->page_shift = page_shift;
                /* MTT PA must be recorded in 4k alignment, t is 4k aligned */
-               buf->direct.buf = dma_alloc_coherent(dev, size, &t, GFP_KERNEL);
+               buf->direct.buf = dma_zalloc_coherent(dev,
+                                                     size, &t, GFP_KERNEL);
                if (!buf->direct.buf)
                        return -ENOMEM;
 
@@ -207,8 +208,6 @@ int hns_roce_buf_alloc(struct hns_roce_dev *hr_dev, u32 size, u32 max_direct,
                        --buf->page_shift;
                        buf->npages *= 2;
                }
-
-               memset(buf->direct.buf, 0, size);
        } else {
                buf->nbufs = (size + page_size - 1) / page_size;
                buf->npages = buf->nbufs;
@@ -220,7 +219,7 @@ int hns_roce_buf_alloc(struct hns_roce_dev *hr_dev, u32 size, u32 max_direct,
                        return -ENOMEM;
 
                for (i = 0; i < buf->nbufs; ++i) {
-                       buf->page_list[i].buf = dma_alloc_coherent(dev,
+                       buf->page_list[i].buf = dma_zalloc_coherent(dev,
                                                                  page_size, &t,
                                                                  GFP_KERNEL);
 
@@ -228,7 +227,6 @@ int hns_roce_buf_alloc(struct hns_roce_dev *hr_dev, u32 size, u32 max_direct,
                                goto err_free;
 
                        buf->page_list[i].map = t;
-                       memset(buf->page_list[i].buf, 0, page_size);
                }
        }