Commit 293d8440 authored by Kamal Heib's avatar Kamal Heib Committed by Jason Gunthorpe
Browse files

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: 8700e3e7 ("Soft RoCE driver")
Link: https://lore.kernel.org/r/20200705104313.283034-4-kamalheib1@gmail.com


Signed-off-by: default avatarKamal Heib <kamalheib1@gmail.com>
Reviewed-by: default avatarLeon Romanovsky <leonro@mellanox.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
parent 9d576eac

drivers/infiniband/sw/rxe/rxe_loc.h

+2 −2
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ enum copy_direction { 
	from_mem_obj,

};



int rxe_mem_init_dma(struct rxe_pd *pd,

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,

drivers/infiniband/sw/rxe/rxe_mr.c

+2 −4
Original line number Diff line number Diff line
@@ -144,7 +144,7 @@ err1: 
	return -ENOMEM;

}



int rxe_mem_init_dma(struct rxe_pd *pd,

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,

drivers/infiniband/sw/rxe/rxe_verbs.c

+3 −17
Original line number Diff line number Diff line
@@ -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,

CRA Git | Maintained and supported by SUSTech CRA and CCSE