Commit d74f2b7f authored by Nicolas Saenz Julienne's avatar Nicolas Saenz Julienne Committed by Greg Kroah-Hartman
Browse files

staging: vchi: Merge vchi_msg_queue() into vchi_queue_kernel_message()



There are no gains from that extra indirection level. Also, get rid of
the function description, the whole file will disappear soon.

Signed-off-by: default avatarNicolas Saenz Julienne <nsaenzjulienne@suse.de>
Link: https://lore.kernel.org/r/20200527115400.31391-5-nsaenzjulienne@suse.de


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a224f284
Loading
Loading
Loading
Loading
+4 −25
Original line number Diff line number Diff line
@@ -84,30 +84,15 @@ int32_t vchi_msg_remove(struct vchi_service_handle *handle)
}
EXPORT_SYMBOL(vchi_msg_remove);

/***********************************************************
 * Name: vchi_msg_queue
 *
 * Arguments:  struct vchi_service_handle *handle,
 *             ssize_t (*copy_callback)(void *context, void *dest,
 *				        size_t offset, size_t maxsize),
 *	       void *context,
 *             uint32_t data_size
 *
 * Description: Thin wrapper to queue a message onto a connection
 *
 * Returns: int32_t - success == 0
 *
 ***********************************************************/
static
int32_t vchi_msg_queue(struct vchi_service_handle *handle, void *context,
		       uint32_t data_size)
int vchi_queue_kernel_message(struct vchi_service_handle *handle, void *data,
			       unsigned int size)
{
	struct shim_service *service = (struct shim_service *)handle;
	enum vchiq_status status;

	while (1) {
		status = vchiq_queue_kernel_message(service->handle, context,
						    data_size);
		status = vchiq_queue_kernel_message(service->handle, data,
						    size);

		/*
		 * vchiq_queue_message() may return VCHIQ_RETRY, so we need to
@@ -122,12 +107,6 @@ int32_t vchi_msg_queue(struct vchi_service_handle *handle, void *context,

	return vchiq_status_to_vchi(status);
}

int vchi_queue_kernel_message(struct vchi_service_handle *handle, void *data,
			      unsigned int size)
{
	return vchi_msg_queue(handle, data, size);
}
EXPORT_SYMBOL(vchi_queue_kernel_message);

/***********************************************************