RDMA/hns: Remove if-else judgment statements for creating srq

Because if the value of srqwqe_buf_pg_sz is zero, npages and
ib_umem_page_count are equivalent, page_shif and PAGE_SHIFT
are equivalent in hns_roce_create_srq. Here remove it.

Signed-off-by: Wenpeng Liang <liangwenpeng@huawei.com>
Signed-off-by: Lijun Ou <oulijun@huawei.com>
Link: https://lore.kernel.org/r/1566393276-42555-8-git-send-email-oulijun@huawei.com
Signed-off-by: Doug Ledford <dledford@redhat.com>

diff --git a/drivers/infiniband/hw/hns/hns_roce_srq.c b/drivers/infiniband/hw/hns/hns_roce_srq.c
index c011422112b2b31388f5a34f4ed893a8d3920a2b..1a421721cf4f14fd6904248b87b30f2ecc5ff40f 100644 (file)
--- a/drivers/infiniband/hw/hns/hns_roce_srq.c
+++ b/drivers/infiniband/hw/hns/hns_roce_srq.c
@@ -191,15 +191,11 @@ static int create_user_srq(struct hns_roce_srq *srq, struct ib_udata *udata,
        if (IS_ERR(srq->umem))
                return PTR_ERR(srq->umem);
 
-       if (hr_dev->caps.srqwqe_buf_pg_sz) {
-               npages = (ib_umem_page_count(srq->umem) +
-                        (1 << hr_dev->caps.srqwqe_buf_pg_sz) - 1) /
-                        (1 << hr_dev->caps.srqwqe_buf_pg_sz);
-               page_shift = PAGE_SHIFT + hr_dev->caps.srqwqe_buf_pg_sz;
-               ret = hns_roce_mtt_init(hr_dev, npages, page_shift, &srq->mtt);
-       } else
-               ret = hns_roce_mtt_init(hr_dev, ib_umem_page_count(srq->umem),
-                                       PAGE_SHIFT, &srq->mtt);
+       npages = (ib_umem_page_count(srq->umem) +
+               (1 << hr_dev->caps.srqwqe_buf_pg_sz) - 1) /
+               (1 << hr_dev->caps.srqwqe_buf_pg_sz);
+       page_shift = PAGE_SHIFT + hr_dev->caps.srqwqe_buf_pg_sz;
+       ret = hns_roce_mtt_init(hr_dev, npages, page_shift, &srq->mtt);
        if (ret)
                goto err_user_buf;
 
@@ -216,19 +212,8 @@ static int create_user_srq(struct hns_roce_srq *srq, struct ib_udata *udata,
                goto err_user_srq_mtt;
        }
 
-       if (hr_dev->caps.idx_buf_pg_sz) {
-               npages = (ib_umem_page_count(srq->idx_que.umem) +
-                        (1 << hr_dev->caps.idx_buf_pg_sz) - 1) /
-                        (1 << hr_dev->caps.idx_buf_pg_sz);
-               page_shift = PAGE_SHIFT + hr_dev->caps.idx_buf_pg_sz;
-               ret = hns_roce_mtt_init(hr_dev, npages, page_shift,
-                                       &srq->idx_que.mtt);
-       } else {
-               ret = hns_roce_mtt_init(hr_dev,
-                                       ib_umem_page_count(srq->idx_que.umem),
-                                       PAGE_SHIFT,
-                                       &srq->idx_que.mtt);
-       }
+       ret = hns_roce_mtt_init(hr_dev, ib_umem_page_count(srq->idx_que.umem),
+                               PAGE_SHIFT, &srq->idx_que.mtt);
 
        if (ret) {
                dev_err(hr_dev->dev, "hns_roce_mtt_init error for idx que\n");