mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

staging: vchi: Get rid of flags argument in vchi_msg_hold() 

All users are ignoring the flags argument. So for the sake of
simplicity delete it.

Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
Link: https://lore.kernel.org/r/20200629150945.10720-19-nsaenzjulienne@suse.de
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Nicolas Saenz Julienne 2020-06-29 17:09:16 +02:00 committed by Greg Kroah-Hartman
parent 115588bf77
commit a24ac57ef8
4 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/staging/vc04_services/bcm2835-audio/bcm2835-vchiq.c
View File

@ -102,8 +102,7 @@ static void audio_vchi_callback(void *param,
if (reason != VCHI_CALLBACK_MSG_AVAILABLE)
return;
status = vchi_msg_hold(instance->service, (void **)&m, &size,
VCHI_FLAGS_NONE, &handle);
status = vchi_msg_hold(instance->service, (void **)&m, &size, &handle);
if (status)
return;

1
drivers/staging/vc04_services/interface/vchi/vchi.h
View File

@ -87,7 +87,6 @@ extern int vchi_queue_kernel_message(struct vchi_service *service, void *data,
extern int32_t vchi_msg_hold(struct vchi_service *service,
void **data, // } may be NULL, as info can be
uint32_t *msg_size, // } obtained from HELD_MSG_T
enum vchi_flags flags,
struct vchi_held_msg *message_descriptor);
/*******************************************************************************

12
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_shim.c
View File

@ -195,7 +195,6 @@ EXPORT_SYMBOL(vchi_held_msg_release);
* Arguments: struct vchi_service *service,
* void **data,
* uint32_t *msg_size,
* enum vchi_flags flags,
* struct vchi_held_msg *message_handle
*
* Description: Routine to return a pointer to the current message (to allow
@ -207,17 +206,12 @@ EXPORT_SYMBOL(vchi_held_msg_release);
*
***********************************************************/
int32_t vchi_msg_hold(struct vchi_service *service, void **data,
uint32_t *msg_size, enum vchi_flags flags,
struct vchi_held_msg *message_handle)
uint32_t *msg_size, struct vchi_held_msg *message_handle)
{
struct vchiq_header *header;
WARN_ON((flags != VCHI_FLAGS_NONE) &&
(flags != VCHI_FLAGS_BLOCK_UNTIL_OP_COMPLETE));
if (flags == VCHI_FLAGS_NONE)
if (vchiu_queue_is_empty(&service->queue))
return -1;
if (vchiu_queue_is_empty(&service->queue))
return -1;
header = vchiu_queue_pop(&service->queue);

2
drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
View File

@ -568,7 +568,7 @@ static void service_callback(void *param,
switch (reason) {
case VCHI_CALLBACK_MSG_AVAILABLE:
status = vchi_msg_hold(instance->service, (void **)&msg,
&msg_len, VCHI_FLAGS_NONE, &msg_handle);
&msg_len, &msg_handle);
if (status) {
pr_err("Unable to dequeue a message (%d)\n", status);
break;