diff options
| author | Nicolas Saenz Julienne <nsaenzjulienne@suse.de> | 2020-05-27 13:53:09 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-05-27 14:03:35 +0200 |
| commit | d74f2b7fe6c3b40408a85cf383907da3905fbbc9 (patch) | |
| tree | cab54ca114cd3c40242acf7f2607a2bb47a1dfdc /drivers/staging | |
| parent | a224f284d03b707a1f6f4aea279a4fecbd61246a (diff) | |
| download | linux-d74f2b7fe6c3b40408a85cf383907da3905fbbc9.tar.bz2 | |
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: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
Link: https://lore.kernel.org/r/20200527115400.31391-5-nsaenzjulienne@suse.de
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/vc04_services/interface/vchiq_arm/vchiq_shim.c | 29 |
1 files changed, 4 insertions, 25 deletions
diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_shim.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_shim.c index 1c5ddea8b076..081ab67ad6fd 100644 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_shim.c +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_shim.c @@ -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); /*********************************************************** |