Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 32404fb7 authored by Bart Van Assche's avatar Bart Van Assche Committed by Doug Ledford
Browse files

IB/rxe: Let the compiler check the type of the cleanup functions 



Change the argument type of these functions from void * into
struct rxe_pool_entry *.

Signed-off-by: default avatarBart Van Assche <bart.vanassche@sandisk.com>
Reviewed-by: default avatarLeon Romanovsky <leonro@mellanox.com>
Reviewed-by: default avatarAndrew Boyer <andrew.boyer@dell.com>
Cc: Moni Shoua <monis@mellanox.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent 046ef24d

drivers/infiniband/sw/rxe/rxe_cq.c

+2 −2
Original line number Diff line number Diff line
@@ -156,9 +156,9 @@ int rxe_cq_post(struct rxe_cq *cq, struct rxe_cqe *cqe, int solicited) 
	return 0;

}



void rxe_cq_cleanup(void *arg)

void rxe_cq_cleanup(struct rxe_pool_entry *arg)

{

	struct rxe_cq *cq = arg;

	struct rxe_cq *cq = container_of(arg, typeof(*cq), pelem);



	if (cq->queue)

		rxe_queue_cleanup(cq->queue);

drivers/infiniband/sw/rxe/rxe_loc.h

+4 −4
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ int rxe_cq_resize_queue(struct rxe_cq *cq, int new_cqe, struct ib_udata *udata); 


int rxe_cq_post(struct rxe_cq *cq, struct rxe_cqe *cqe, int solicited);



void rxe_cq_cleanup(void *arg);

void rxe_cq_cleanup(struct rxe_pool_entry *arg);



/* rxe_mcast.c */

int rxe_mcast_get_grp(struct rxe_dev *rxe, union ib_gid *mgid,
@@ -78,7 +78,7 @@ int rxe_mcast_drop_grp_elem(struct rxe_dev *rxe, struct rxe_qp *qp, 


void rxe_drop_all_mcast_groups(struct rxe_qp *qp);



void rxe_mc_cleanup(void *arg);

void rxe_mc_cleanup(struct rxe_pool_entry *arg);



/* rxe_mmap.c */

struct rxe_mmap_info {
@@ -137,7 +137,7 @@ int mem_check_range(struct rxe_mem *mem, u64 iova, size_t length); 
int rxe_mem_map_pages(struct rxe_dev *rxe, struct rxe_mem *mem,

		      u64 *page, int num_pages, u64 iova);



void rxe_mem_cleanup(void *arg);

void rxe_mem_cleanup(struct rxe_pool_entry *arg);



int advance_dma_data(struct rxe_dma_info *dma, unsigned int length);
@@ -162,7 +162,7 @@ void rxe_qp_error(struct rxe_qp *qp); 


void rxe_qp_destroy(struct rxe_qp *qp);



void rxe_qp_cleanup(void *arg);

void rxe_qp_cleanup(struct rxe_pool_entry *arg);



static inline int qp_num(struct rxe_qp *qp)

{

drivers/infiniband/sw/rxe/rxe_mcast.c

+2 −2
Original line number Diff line number Diff line
@@ -180,9 +180,9 @@ void rxe_drop_all_mcast_groups(struct rxe_qp *qp) 
	}

}



void rxe_mc_cleanup(void *arg)

void rxe_mc_cleanup(struct rxe_pool_entry *arg)

{

	struct rxe_mc_grp *grp = arg;

	struct rxe_mc_grp *grp = container_of(arg, typeof(*grp), pelem);

	struct rxe_dev *rxe = grp->rxe;



	rxe_drop_key(grp);

drivers/infiniband/sw/rxe/rxe_mr.c

+2 −2
Original line number Diff line number Diff line
@@ -89,9 +89,9 @@ static void rxe_mem_init(int access, struct rxe_mem *mem) 
	mem->map_shift		= ilog2(RXE_BUF_PER_MAP);

}



void rxe_mem_cleanup(void *arg)

void rxe_mem_cleanup(struct rxe_pool_entry *arg)

{

	struct rxe_mem *mem = arg;

	struct rxe_mem *mem = container_of(arg, typeof(*mem), pelem);

	int i;



	if (mem->umem)

drivers/infiniband/sw/rxe/rxe_pool.h

+4 −2
Original line number Diff line number Diff line
@@ -57,10 +57,12 @@ enum rxe_elem_type { 
	RXE_NUM_TYPES,		/* keep me last */

};



struct rxe_pool_entry;



struct rxe_type_info {

	const char		*name;

	size_t			size;

	void			(*cleanup)(void *obj);

	void			(*cleanup)(struct rxe_pool_entry *obj);

	enum rxe_pool_flags	flags;

	u32			max_index;

	u32			min_index;
@@ -91,7 +93,7 @@ struct rxe_pool { 
	spinlock_t              pool_lock; /* pool spinlock */

	size_t			elem_size;

	struct kref		ref_cnt;

	void			(*cleanup)(void *obj);

	void			(*cleanup)(struct rxe_pool_entry *obj);

	enum rxe_pool_state	state;

	enum rxe_pool_flags	flags;

	enum rxe_elem_type	type;