RDMA/rxe: Return void from rxe_mem_init_dma()

The return value from rxe_mem_init_dma() is always 0 - change it to be
void and fix the callers accordingly.

Fixes: 8700e3e7c485 ("Soft RoCE driver")
Link: https://lore.kernel.org/r/20200705104313.283034-4-kamalheib1@gmail.com
Signed-off-by: Kamal Heib <kamalheib1@gmail.com>
Reviewed-by: Leon Romanovsky <leonro@mellanox.com>
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>

diff --git a/drivers/infiniband/sw/rxe/rxe_loc.h b/drivers/infiniband/sw/rxe/rxe_loc.h
index 238d6a357aac270213e24648efdd35edc998eed4..0688928cf2b1c55c4a633946ef017b0bcebe65de 100644 (file)
--- a/drivers/infiniband/sw/rxe/rxe_loc.h
+++ b/drivers/infiniband/sw/rxe/rxe_loc.h
@@ -103,8 +103,8 @@ enum copy_direction {
        from_mem_obj,
 };
 
-int rxe_mem_init_dma(struct rxe_pd *pd,
-                    int access, struct rxe_mem *mem);
+void rxe_mem_init_dma(struct rxe_pd *pd,
+                     int access, struct rxe_mem *mem);
 
 int rxe_mem_init_user(struct rxe_pd *pd, u64 start,
                      u64 length, u64 iova, int access, struct ib_udata *udata,

diff --git a/drivers/infiniband/sw/rxe/rxe_mr.c b/drivers/infiniband/sw/rxe/rxe_mr.c
index a63cb5fac01ff0cf789a3b60a50392a26dbbc9f4..cdd811a45120f4e5a5b274895c84d6759f200a8e 100644 (file)
--- a/drivers/infiniband/sw/rxe/rxe_mr.c
+++ b/drivers/infiniband/sw/rxe/rxe_mr.c
@@ -144,8 +144,8 @@ err1:
        return -ENOMEM;
 }
 
-int rxe_mem_init_dma(struct rxe_pd *pd,
-                    int access, struct rxe_mem *mem)
+void rxe_mem_init_dma(struct rxe_pd *pd,
+                     int access, struct rxe_mem *mem)
 {
        rxe_mem_init(access, mem);
 
@@ -153,8 +153,6 @@ int rxe_mem_init_dma(struct rxe_pd *pd,
        mem->access             = access;
        mem->state              = RXE_MEM_STATE_VALID;
        mem->type               = RXE_MEM_TYPE_DMA;
-
-       return 0;
 }
 
 int rxe_mem_init_user(struct rxe_pd *pd, u64 start,

diff --git a/drivers/infiniband/sw/rxe/rxe_verbs.c b/drivers/infiniband/sw/rxe/rxe_verbs.c
index 0472df52d36d6fa86c16ac45ff9d20bb57a49516..0f5b3c062f329ae0a14d73ebf69b5fad499a14a4 100644 (file)
--- a/drivers/infiniband/sw/rxe/rxe_verbs.c
+++ b/drivers/infiniband/sw/rxe/rxe_verbs.c
@@ -901,30 +901,16 @@ static struct ib_mr *rxe_get_dma_mr(struct ib_pd *ibpd, int access)
        struct rxe_dev *rxe = to_rdev(ibpd->device);
        struct rxe_pd *pd = to_rpd(ibpd);
        struct rxe_mem *mr;
-       int err;
 
        mr = rxe_alloc(&rxe->mr_pool);
-       if (!mr) {
-               err = -ENOMEM;
-               goto err1;
-       }
+       if (!mr)
+               return ERR_PTR(-ENOMEM);
 
        rxe_add_index(mr);
-
        rxe_add_ref(pd);
-
-       err = rxe_mem_init_dma(pd, access, mr);
-       if (err)
-               goto err2;
+       rxe_mem_init_dma(pd, access, mr);
 
        return &mr->ibmr;
-
-err2:
-       rxe_drop_ref(pd);
-       rxe_drop_index(mr);
-       rxe_drop_ref(mr);
-err1:
-       return ERR_PTR(err);
 }
 
 static struct ib_mr *rxe_reg_user_mr(struct ib_pd *ibpd,