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

Commit 90963ad7 authored by Harish Chegondi's avatar Harish Chegondi Committed by Doug Ledford
Browse files

staging/rdma/hfi1: Remove user context allocation and de-alloction functions 



IB user context alloc and dealloc functions have been added to rdmavt.
This patch removes them from hfi1.

Reviewed-by: default avatarDennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: default avatarHarish Chegondi <harish.chegondi@intel.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent d604e1d2

drivers/staging/rdma/hfi1/verbs.c

+2 −42
Original line number Diff line number Diff line
@@ -152,16 +152,6 @@ const int ib_hfi1_state_ops[IB_QPS_ERR + 1] = { 
	    HFI1_POST_SEND_OK | HFI1_FLUSH_SEND,

};



struct hfi1_ucontext {

	struct ib_ucontext ibucontext;

};



static inline struct hfi1_ucontext *to_iucontext(struct ib_ucontext

						  *ibucontext)

{

	return container_of(ibucontext, struct hfi1_ucontext, ibucontext);

}



static inline void _hfi1_schedule_send(struct rvt_qp *qp);



/*
@@ -1679,36 +1669,6 @@ unsigned hfi1_get_npkeys(struct hfi1_devdata *dd) 
	return ARRAY_SIZE(dd->pport[0].pkeys);

}



/**

 * alloc_ucontext - allocate a ucontest

 * @ibdev: the infiniband device

 * @udata: not used by the driver

 */



static struct ib_ucontext *alloc_ucontext(struct ib_device *ibdev,

					  struct ib_udata *udata)

{

	struct hfi1_ucontext *context;

	struct ib_ucontext *ret;



	context = kmalloc(sizeof(*context), GFP_KERNEL);

	if (!context) {

		ret = ERR_PTR(-ENOMEM);

		goto bail;

	}



	ret = &context->ibucontext;



bail:

	return ret;

}



static int dealloc_ucontext(struct ib_ucontext *context)

{

	kfree(to_iucontext(context));

	return 0;

}



static void init_ibport(struct hfi1_pportdata *ppd)

{

	struct hfi1_ibport *ibp = &ppd->ibport_data;
@@ -1848,8 +1808,8 @@ int hfi1_register_ib_device(struct hfi1_devdata *dd) 
	ibdev->modify_port = modify_port;

	ibdev->query_pkey = NULL;

	ibdev->query_gid = query_gid;

	ibdev->alloc_ucontext = alloc_ucontext;

	ibdev->dealloc_ucontext = dealloc_ucontext;

	ibdev->alloc_ucontext = NULL;

	ibdev->dealloc_ucontext = NULL;

	ibdev->alloc_pd = NULL;

	ibdev->dealloc_pd = NULL;

	ibdev->create_ah = NULL;