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

Commit 76bc79cc authored by Jason Gunthorpe's avatar Jason Gunthorpe
Browse files

IB/uverbs: Replace ib_ucq_object uverbs_file with the one in ib_uobject 



Now that ib_uobject has a ib_uverbs_file we don't need this extra one in
ib_ucq_object.

Signed-off-by: default avatarJason Gunthorpe <jgg@mellanox.com>
parent d0259e82

drivers/infiniband/core/uverbs.h

+0 −1
Original line number Diff line number Diff line
@@ -204,7 +204,6 @@ struct ib_uwq_object { 


struct ib_ucq_object {

	struct ib_uobject	uobject;

	struct ib_uverbs_file  *uverbs_file;

	struct list_head	comp_list;

	struct list_head	async_list;

	u32			comp_events_reported;

drivers/infiniband/core/uverbs_cmd.c

+0 −1
Original line number Diff line number Diff line
@@ -976,7 +976,6 @@ static struct ib_ucq_object *create_cq(struct ib_uverbs_file *file, 
	}



	obj->uobject.user_handle = cmd->user_handle;

	obj->uverbs_file	   = file;

	obj->comp_events_reported  = 0;

	obj->async_events_reported = 0;

	INIT_LIST_HEAD(&obj->comp_list);

drivers/infiniband/core/uverbs_main.c

+1 −1
Original line number Diff line number Diff line
@@ -538,7 +538,7 @@ void ib_uverbs_cq_event_handler(struct ib_event *event, void *context_ptr) 
	struct ib_ucq_object *uobj = container_of(event->element.cq->uobject,

						  struct ib_ucq_object, uobject);



	ib_uverbs_async_handler(uobj->uverbs_file, uobj->uobject.user_handle,

	ib_uverbs_async_handler(uobj->uobject.ufile, uobj->uobject.user_handle,

				event->event, &uobj->async_list,

				&uobj->async_events_reported);

}

drivers/infiniband/core/uverbs_std_types_cq.c

+0 −1
Original line number Diff line number Diff line
@@ -105,7 +105,6 @@ static int UVERBS_HANDLER(UVERBS_METHOD_CQ_CREATE)(struct ib_device *ib_dev, 
	obj = container_of(uverbs_attr_get_uobject(attrs,

						   UVERBS_ATTR_CREATE_CQ_HANDLE),

			   typeof(*obj), uobject);

	obj->uverbs_file	   = file;

	obj->comp_events_reported  = 0;

	obj->async_events_reported = 0;

	INIT_LIST_HEAD(&obj->comp_list);