Commit c5633a72 authored by Leon Romanovsky's avatar Leon Romanovsky Committed by Jason Gunthorpe
Browse files

RDMA/core: Make FD destroy callback void 

All FD object destroy implementations return 0, so declare this callback
void.

Link: https://lore.kernel.org/r/20201104144556.3809085-3-leon@kernel.org


Reviewed-by: default avatarJason Gunthorpe <jgg@nvidia.com>
Signed-off-by: default avatarLeon Romanovsky <leonro@nvidia.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
parent efa968ee

drivers/infiniband/core/rdma_core.c

+2 −1
Original line number Diff line number Diff line
@@ -571,7 +571,8 @@ static int __must_check destroy_hw_fd_uobject(struct ib_uobject *uobj, 
	const struct uverbs_obj_fd_type *fd_type = container_of(

		uobj->uapi_object->type_attrs, struct uverbs_obj_fd_type, type);



	return fd_type->destroy_object(uobj, why);

	fd_type->destroy_object(uobj, why);

	return 0;

}



static void remove_handle_fd_uobject(struct ib_uobject *uobj)

drivers/infiniband/core/uverbs_std_types.c

+1 −2
Original line number Diff line number Diff line
@@ -154,7 +154,7 @@ void ib_uverbs_free_event_queue(struct ib_uverbs_event_queue *event_queue) 
	spin_unlock_irq(&event_queue->lock);

}



static int

static void

uverbs_completion_event_file_destroy_uobj(struct ib_uobject *uobj,

					  enum rdma_remove_reason why)

{
@@ -163,7 +163,6 @@ uverbs_completion_event_file_destroy_uobj(struct ib_uobject *uobj, 
			     uobj);



	ib_uverbs_free_event_queue(&file->ev_queue);

	return 0;

}



int uverbs_destroy_def_handler(struct uverbs_attr_bundle *attrs)

drivers/infiniband/core/uverbs_std_types_async_fd.c

+2 −3
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ static int UVERBS_HANDLER(UVERBS_METHOD_ASYNC_EVENT_ALLOC)( 
	return 0;

}



static int uverbs_async_event_destroy_uobj(struct ib_uobject *uobj,

static void uverbs_async_event_destroy_uobj(struct ib_uobject *uobj,

					    enum rdma_remove_reason why)

{

	struct ib_uverbs_async_event_file *event_file =
@@ -30,7 +30,6 @@ static int uverbs_async_event_destroy_uobj(struct ib_uobject *uobj, 
	if (why == RDMA_REMOVE_DRIVER_REMOVE)

		ib_uverbs_async_handler(event_file, 0, IB_EVENT_DEVICE_FATAL,

					NULL, NULL);

	return 0;

}



int uverbs_async_event_release(struct inode *inode, struct file *filp)

drivers/infiniband/hw/mlx5/devx.c

+4 −6
Original line number Diff line number Diff line
@@ -2594,7 +2594,7 @@ static const struct file_operations devx_async_event_fops = { 
	.llseek	 = no_llseek,

};



static int devx_async_cmd_event_destroy_uobj(struct ib_uobject *uobj,

static void devx_async_cmd_event_destroy_uobj(struct ib_uobject *uobj,

					      enum rdma_remove_reason why)

{

	struct devx_async_cmd_event_file *comp_ev_file =
@@ -2617,10 +2617,9 @@ static int devx_async_cmd_event_destroy_uobj(struct ib_uobject *uobj, 
		kvfree(entry);

	}

	spin_unlock_irq(&comp_ev_file->ev_queue.lock);

	return 0;

};



static int devx_async_event_destroy_uobj(struct ib_uobject *uobj,

static void devx_async_event_destroy_uobj(struct ib_uobject *uobj,

					  enum rdma_remove_reason why)

{

	struct devx_async_event_file *ev_file =
@@ -2665,7 +2664,6 @@ static int devx_async_event_destroy_uobj(struct ib_uobject *uobj, 
	mutex_unlock(&dev->devx_event_table.event_xa_lock);



	put_device(&dev->ib_dev.dev);

	return 0;

};



DECLARE_UVERBS_NAMED_METHOD(

include/rdma/uverbs_types.h

+2 −2
Original line number Diff line number Diff line
@@ -138,7 +138,7 @@ struct uverbs_obj_fd_type { 
	 * because the driver is removed or the FD is closed.

	 */

	struct uverbs_obj_type  type;

	int (*destroy_object)(struct ib_uobject *uobj,

	void (*destroy_object)(struct ib_uobject *uobj,

			       enum rdma_remove_reason why);

	const struct file_operations	*fops;

	const char			*name;