iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

staging: vchi: Use vchiq's enum vchiq_reason

Browse Source 
enum vchi_callback_reason maps 1:1 to enum vchiq_reason, in an effort to
simplify things, let's use the later, and get rid of the extra
indirection.

Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
Link: https://lore.kernel.org/r/20200629150945.10720-21-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:18 +02:00 committed by Greg Kroah-Hartman
parent 0abd7412e9
commit 469fbb24ce
4 changed files with 10 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -89,8 +89,7 @@ static int bcm2835_audio_send_simple(struct bcm2835_audio_instance *instance,
return bcm2835_audio_send_msg(instance, &m, wait);
}
static void audio_vchi_callback(void *param,
const enum vchi_callback_reason reason,
static void audio_vchi_callback(void *param, const enum vchiq_reason reason,
void *msg_handle)
{
struct bcm2835_audio_instance *instance = param;
@ -99,7 +98,7 @@ static void audio_vchi_callback(void *param,
unsigned size;
int status;
if (reason != VCHI_CALLBACK_MSG_AVAILABLE)
if (reason != VCHIQ_MESSAGE_AVAILABLE)
return;
status = vchi_msg_hold(instance->service, (void **)&m, &size, &handle);

20
drivers/staging/vc04_services/interface/vchi/vchi_common.h
View File

@ -4,27 +4,9 @@
#ifndef VCHI_COMMON_H_
#define VCHI_COMMON_H_
//callback reasons when an event occurs on a service
enum vchi_callback_reason {
/*
* This indicates that there is data available handle is the msg id that
* was transmitted with the data
* When a message is received and there was no FULL message available
* previously, send callback
* Tasks get kicked by the callback, reset their event and try and read
* from the fifo until it fails
*/
VCHI_CALLBACK_SERVICE_CLOSED,
VCHI_CALLBACK_MSG_AVAILABLE,
VCHI_CALLBACK_BULK_SENT,
VCHI_CALLBACK_BULK_RECEIVED,
VCHI_CALLBACK_BULK_TRANSMIT_ABORTED,
VCHI_CALLBACK_BULK_RECEIVE_ABORTED,
};
//Callback used by all services / bulk transfers
typedef void (*vchi_callback)(void *callback_param, //my service local param
enum vchi_callback_reason reason,
enum vchiq_reason reason,
void *handle); //for transmitting msg's only
#endif // VCHI_COMMON_H_

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

@ -274,46 +274,10 @@ static enum vchiq_status shim_callback(enum vchiq_reason reason,
if (!service->callback)
goto release;
switch (reason) {
case VCHIQ_MESSAGE_AVAILABLE:
if (reason == VCHIQ_MESSAGE_AVAILABLE)
vchiu_queue_push(&service->queue, header);
service->callback(service->callback_param,
VCHI_CALLBACK_MSG_AVAILABLE, NULL);
break;
case VCHIQ_BULK_TRANSMIT_DONE:
service->callback(service->callback_param,
VCHI_CALLBACK_BULK_SENT, bulk_user);
break;
case VCHIQ_BULK_RECEIVE_DONE:
service->callback(service->callback_param,
VCHI_CALLBACK_BULK_RECEIVED, bulk_user);
break;
case VCHIQ_SERVICE_CLOSED:
service->callback(service->callback_param,
VCHI_CALLBACK_SERVICE_CLOSED, NULL);
break;
case VCHIQ_BULK_TRANSMIT_ABORTED:
service->callback(service->callback_param,
VCHI_CALLBACK_BULK_TRANSMIT_ABORTED,
bulk_user);
break;
case VCHIQ_BULK_RECEIVE_ABORTED:
service->callback(service->callback_param,
VCHI_CALLBACK_BULK_RECEIVE_ABORTED,
bulk_user);
break;
default:
WARN(1, "not supported\n");
break;
}
service->callback(service->callback_param, reason, bulk_user);
release:
return VCHIQ_SUCCESS;

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

@ -549,8 +549,7 @@ static void bulk_abort_cb(struct vchiq_mmal_instance *instance,
}
/* incoming event service callback */
static void service_callback(void *param,
const enum vchi_callback_reason reason,
static void service_callback(void *param, const enum vchiq_reason reason,
void *bulk_ctx)
{
struct vchiq_mmal_instance *instance = param;
@ -566,7 +565,7 @@ static void service_callback(void *param,
}
switch (reason) {
case VCHI_CALLBACK_MSG_AVAILABLE:
case VCHIQ_MESSAGE_AVAILABLE:
status = vchi_msg_hold(instance->service, (void **)&msg,
&msg_len, &msg_handle);
if (status) {
@ -631,15 +630,15 @@ static void service_callback(void *param,
break;
case VCHI_CALLBACK_BULK_RECEIVED:
case VCHIQ_BULK_RECEIVE_DONE:
bulk_receive_cb(instance, bulk_ctx);
break;
case VCHI_CALLBACK_BULK_RECEIVE_ABORTED:
case VCHIQ_BULK_RECEIVE_ABORTED:
bulk_abort_cb(instance, bulk_ctx);
break;
case VCHI_CALLBACK_SERVICE_CLOSED:
case VCHIQ_SERVICE_CLOSED:
/* TODO: consider if this requires action if received when
* driver is not explicitly closing the service
*/