staging: vc04_services: Replace typedefs and
Subsystems (3)
v2 cover staging: vc04_services: Replace typedefs and
This patchset replaces typedefs with native types where feasible and renames callback functions to match kernel code style.
Changes in v2:
- Rewrite patch subject lines and body to be more descriptive for all patches.
Jamal Shareef (14):
staging: vc04_services: Replace VCHI_INSTANCE_T with struct
vhci_instance_handle
staging: vc04_services: Replace VCHI_SERVICE_HANDLE_T typedef with
struct vchi_service_handle
staging: vc04_services: Rename callback VCHI_CALLBACK_T to
vchi_callback
staging: vc04_services: Replace VCHIQ_STATUS_T enum typedef with enum
vchiq_status
staging: vc04_services: Replace VCHIQ_BULK_MODE_T enum typedef with
enum vchiq_bulk_mode
staging: vc04_services: Replace VCHIQ_SERVICE_OPTION_T enum typedef
with enum vchiq_service_option
staging: vc04_services: Replace VCHIQ_CONNSTATE_T enum typedef with
enum vchiq_connstate
staging: vc04_services: Replace VCHIQ_BULK_DIR_T enum typedef with
enum vchiq_bulk_dir
staging: vc04_services: Rename callback VCHIQ_USERDATA_TERM_T to
vchiq_userdata_term
staging: vc04_services: Rename VCHIQ_CALLBACK_T to vchiq_callback
staging: vc04_services: Rename VCHIQ_REMOTE_USE_CALLBACK_T to
vchiq_remote_callback
staging: vc04_services: Replace VCHIQ_SERVICE_HANDLE_T typedef with
unsigned int
staging: vc04_services: Replace VCHIQ_INSTANCE_T typedef with struct
vchiq_instance
staging: vc04_services: Replace VCHIQ_PLATFORM_STATE_T typedef with
struct opaque_platform_state
.../bcm2835-audio/bcm2835-vchiq.c | 4 +- .../vc04_services/bcm2835-audio/bcm2835.h | 2 +- .../vc04_services/bcm2835-camera/mmal-vchiq.c | 4 +- .../vc04_services/interface/vchi/vchi.h | 56 +++--- .../interface/vchi/vchi_common.h | 6 +- .../interface/vchiq_arm/vchiq_2835_arm.c | 10 +- .../interface/vchiq_arm/vchiq_arm.c | 170 +++++++++--------- .../interface/vchiq_arm/vchiq_arm.h | 32 ++-- .../interface/vchiq_arm/vchiq_core.c | 116 ++++++------ .../interface/vchiq_arm/vchiq_core.h | 88 ++++----- .../interface/vchiq_arm/vchiq_debugfs.c | 14 +- .../interface/vchiq_arm/vchiq_debugfs.h | 4 +- .../interface/vchiq_arm/vchiq_if.h | 92 +++++----- .../interface/vchiq_arm/vchiq_ioctl.h | 4 +- .../interface/vchiq_arm/vchiq_shim.c | 116 ++++++------ 15 files changed, 358 insertions(+), 360 deletions(-)
Signature · 1 line
2.17.1
PATCH v2 1/14 staging: vc04_services: Replace VCHI_INSTANCE_T with struct vhci_instance_handle
Replaces VCHI_INSTANCE_T typedef with struct vchi_instance_handle to match kernel code style. Issue found by checkpatch.
--- .../bcm2835-audio/bcm2835-vchiq.c | 2 +- .../vc04_services/bcm2835-audio/bcm2835.h | 2 +- .../vc04_services/bcm2835-camera/mmal-vchiq.c | 2 +- .../vc04_services/interface/vchi/vchi.h | 12 ++++++------ .../interface/vchiq_arm/vchiq_shim.c | 18 +++++++++--------- 5 files changed, 18 insertions(+), 18 deletions(-)
drivers/staging/vc04_services/bcm2835-audio/bcm2835-vchiq.c +1 -1
@@ -122,7 +122,7 @@ static void audio_vchi_callback(void *param, }static int -vc_vchi_audio_init (VCHI_INSTANCE_T vchi_instance, +vc_vchi_audio_init (struct vchi_instance_handle *vchi_instance,struct bcm2835_audio_instance *instance) {struct service_creation params = {
drivers/staging/vc04_services/bcm2835-audio/bcm2835.h +1 -1
@@ -44,7 +44,7 @@ enum snd_bcm2835_ctrl { };struct bcm2835_vchi_ctx { -VCHI_INSTANCE_T vchi_instance; +struct vchi_instance_handle *vchi_instance; };/* definition of the chip-specific record */
drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.c +1 -1
@@ -1814,7 +1814,7 @@ int vchiq_mmal_init(struct vchiq_mmal_instance **out_instance) {int status;struct vchiq_mmal_instance *instance; -static VCHI_INSTANCE_T vchi_instance; +static struct vchi_instance_handle *vchi_instance;struct service_creation params = { .version =VCHI_VERSION_EX (VC_MMAL_VER ,VC_MMAL_MIN_VER ), .service_id =VC_MMAL_SERVER_NAME ,
drivers/staging/vc04_services/interface/vchi/vchi.h +6 -6
@@ -50,7 +50,7 @@ struct service_creation { };// Opaque handle for a VCHI instance -typedef struct opaque_vchi_instance_handle_t *VCHI_INSTANCE_T ; +struct vchi_instance_handle ;// Opaque handle for a server or client typedef struct opaque_vchi_service_handle_t *VCHI_SERVICE_HANDLE_T ;
@@ -65,20 +65,20 @@ extern "C" {#endif // Routine used to initialise the vchi on both local + remote connections -extern int32_t vchi_initialise (VCHI_INSTANCE_T *instance_handle); +extern int32_t vchi_initialise (struct vchi_instance_handle **instance_handle);extern int32_t vchi_exit (void ); -extern int32_t vchi_connect (VCHI_INSTANCE_T instance_handle); +extern int32_t vchi_connect (struct vchi_instance_handle *instance_handle);//When this is called, ensure that all services have no data pending. //Bulk transfers can remain 'queued' -extern int32_t vchi_disconnect (VCHI_INSTANCE_T instance_handle); +extern int32_t vchi_disconnect (struct vchi_instance_handle *instance_handle);// helper functions extern void *vchi_allocate_buffer (VCHI_SERVICE_HANDLE_T handle,uint32_t *length);extern void vchi_free_buffer (VCHI_SERVICE_HANDLE_T handle,void *address); -extern uint32_t vchi_current_time (VCHI_INSTANCE_T instance_handle); +extern uint32_t vchi_current_time (struct vchi_instance_handle *instance_handle);/****************************************************************************** * Global service API
@@ -87,7 +87,7 @@ extern uint32_t vchi_current_time(VCHI_INSTANCE_T instance_handle);extern int32_t vchi_service_destroy (const VCHI_SERVICE_HANDLE_T handle);// Routine to open a named service -extern int32_t vchi_service_open (VCHI_INSTANCE_T instance_handle, +extern int32_t vchi_service_open (struct vchi_instance_handle *instance_handle,struct service_creation *setup,VCHI_SERVICE_HANDLE_T *handle);
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_shim.c +9 -9
@@ -428,7 +428,7 @@ EXPORT_SYMBOL(vchi_msg_hold);/*********************************************************** * Name: vchi_initialise * -* Arguments: VCHI_INSTANCE_T *instance_handle +* Arguments: struct vchi_instance_handle **instance_handle * * Description: Initialises the hardware but does not transmit anything * When run as a Host App this will be called twice hence the need
@@ -438,14 +438,14 @@ EXPORT_SYMBOL(vchi_msg_hold);* ***********************************************************/ -int32_t vchi_initialise (VCHI_INSTANCE_T *instance_handle) +int32_t vchi_initialise (struct vchi_instance_handle **instance_handle) {VCHIQ_INSTANCE_T instance;VCHIQ_STATUS_T status; status =vchiq_initialise (&instance); - *instance_handle = (VCHI_INSTANCE_T )instance; + *instance_handle = (struct vchi_instance_handle *)instance;return vchiq_status_to_vchi (status); }
@@ -454,7 +454,7 @@ EXPORT_SYMBOL(vchi_initialise);/*********************************************************** * Name: vchi_connect * -* Arguments: VCHI_INSTANCE_T instance_handle +* Arguments: struct vchi_instance_handle *instance_handle * * Description: Starts the command service on each connection, * causing INIT messages to be pinged back and forth
@@ -462,7 +462,7 @@ EXPORT_SYMBOL(vchi_initialise);* Returns: 0 if successful, failure otherwise * ***********************************************************/ -int32_t vchi_connect (VCHI_INSTANCE_T instance_handle) +int32_t vchi_connect (struct vchi_instance_handle *instance_handle) {VCHIQ_INSTANCE_T instance = (VCHIQ_INSTANCE_T )instance_handle;
@@ -473,7 +473,7 @@ EXPORT_SYMBOL(vchi_connect);/*********************************************************** * Name: vchi_disconnect * -* Arguments: VCHI_INSTANCE_T instance_handle +* Arguments: struct vchi_instance_handle *instance_handle * * Description: Stops the command service on each connection, * causing DE-INIT messages to be pinged back and forth
@@ -481,7 +481,7 @@ EXPORT_SYMBOL(vchi_connect);* Returns: 0 if successful, failure otherwise * ***********************************************************/ -int32_t vchi_disconnect (VCHI_INSTANCE_T instance_handle) +int32_t vchi_disconnect (struct vchi_instance_handle *instance_handle) {VCHIQ_INSTANCE_T instance = (VCHIQ_INSTANCE_T )instance_handle;
@@ -493,7 +493,7 @@ EXPORT_SYMBOL(vchi_disconnect);* Name: vchi_service_open * Name: vchi_service_create * -* Arguments: VCHI_INSTANCE_T *instance_handle +* Arguments: struct vchi_instance_handle *instance_handle * struct service_creation *setup, * VCHI_SERVICE_HANDLE_T *handle *
@@ -593,7 +593,7 @@ static void service_free(struct shim_service *service) } } -int32_t vchi_service_open (VCHI_INSTANCE_T instance_handle, +int32_t vchi_service_open (struct vchi_instance_handle *instance_handle,struct service_creation *setup,VCHI_SERVICE_HANDLE_T *handle) {
Signature · 1 line
2.17.1
PATCH v2 2/14 staging: vc04_services: Replace VCHI_SERVICE_HANDLE_T typedef with struct vchi_service_handle
In reply to Jamal ShareefReplaces VCHI_SERVICE_HANDLE_T typedef with vchi_service_handle struct to match kernel code style. Issue found by checkpatch.
--- .../bcm2835-audio/bcm2835-vchiq.c | 2 +- .../vc04_services/bcm2835-camera/mmal-vchiq.c | 2 +- .../vc04_services/interface/vchi/vchi.h | 42 ++++++++-------- .../interface/vchiq_arm/vchiq_shim.c | 50 +++++++++---------- 4 files changed, 48 insertions(+), 48 deletions(-)
drivers/staging/vc04_services/bcm2835-audio/bcm2835-vchiq.c +1 -1
@@ -9,7 +9,7 @@struct bcm2835_audio_instance {struct device *dev; -VCHI_SERVICE_HANDLE_T vchi_handle; +struct vchi_service_handle *vchi_handle;struct completion msg_avail_comp;struct mutex vchi_mutex;struct bcm2835_alsa_stream *alsa_stream;
drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.c +1 -1
@@ -155,7 +155,7 @@ struct mmal_msg_context { };struct vchiq_mmal_instance { -VCHI_SERVICE_HANDLE_T handle; +struct vchi_service_handle *handle;/* ensure serialised access to service */ struct mutex vchiq_mutex;
drivers/staging/vc04_services/interface/vchi/vchi.h +21 -21
135 lines not on this page · raw message
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_shim.c +25 -25
198 lines not on this page · raw message
Signature · 1 line
2.17.1
PATCH v2 3/14 staging: vc04_services: Rename callback VCHI_CALLBACK_T to vchi_callback
In reply to Jamal ShareefRenames callback function pointer typedef VCHI_CALLBACK_T to vchi_callback to better match kernel code style.
--- drivers/staging/vc04_services/interface/vchi/vchi.h | 2 +- drivers/staging/vc04_services/interface/vchi/vchi_common.h | 6 +++--- .../staging/vc04_services/interface/vchiq_arm/vchiq_shim.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-)
drivers/staging/vc04_services/interface/vchi/vchi.h +1 -1
@@ -45,7 +45,7 @@ struct vchi_held_msg {struct service_creation {struct vchi_version version;int32_t service_id; -VCHI_CALLBACK_T callback; +vchi_callback callback;void *callback_param; };
drivers/staging/vc04_services/interface/vchi/vchi_common.h +3 -3
@@ -86,9 +86,9 @@ enum vchi_service_option { };//Callback used by all services / bulk transfers -typedef void (*VCHI_CALLBACK_T )(void *callback_param,//my service local param -enum vchi_callback_reason reason, -void *handle);//for transmitting msg's only +typedef void (*vchi_callback )(void *callback_param,//my service local param +enum vchi_callback_reason reason, +void *handle);//for transmitting msg's only /* * Define vector struct for scatter-gather (vector) operations
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_shim.c +1 -1
@@ -16,7 +16,7 @@ struct shim_service {struct vchiu_queue queue; -VCHI_CALLBACK_T callback; +vchi_callback callback;void *callback_param; };
Signature · 1 line
2.17.1
PATCH v2 4/14 staging: vc04_services: Replace VCHIQ_STATUS_T enum typedef with enum vchiq_status
In reply to Jamal ShareefReplaces VCHIQ_STATUS_T enum typedef with enum vchiq_status to match kernel code style. Issue found by checkpatch.
--- .../interface/vchiq_arm/vchiq_2835_arm.c | 10 +-- .../interface/vchiq_arm/vchiq_arm.c | 80 +++++++++---------- .../interface/vchiq_arm/vchiq_arm.h | 18 ++--- .../interface/vchiq_arm/vchiq_core.c | 66 +++++++-------- .../interface/vchiq_arm/vchiq_core.h | 28 +++---- .../interface/vchiq_arm/vchiq_if.h | 44 +++++----- .../interface/vchiq_arm/vchiq_shim.c | 20 ++--- 7 files changed, 133 insertions(+), 133 deletions(-)
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c +5 -5
@@ -168,10 +168,10 @@ int vchiq_platform_init(struct platform_device *pdev, struct vchiq_state *state)return 0 ; } -VCHIQ_STATUS_T +enum vchiq_status vchiq_platform_init_state (struct vchiq_state *state) { -VCHIQ_STATUS_T status =VCHIQ_SUCCESS ; +enum vchiq_status status =VCHIQ_SUCCESS ;struct vchiq_2835_state *platform_state; state->platform_state =kzalloc (sizeof (*platform_state),GFP_KERNEL );
@@ -214,7 +214,7 @@ remote_event_signal(struct remote_event *event)writel (0 , g_regs +BELL2 );/* trigger vc interrupt */ } -VCHIQ_STATUS_T +enum vchiq_status vchiq_prepare_bulk_data (struct vchiq_bulk *bulk,void *offset,int size,int dir) {
@@ -258,13 +258,13 @@ vchiq_dump_platform_state(void *dump_context)vchiq_dump (dump_context, buf, len +1 ); } -VCHIQ_STATUS_T +enum vchiq_status vchiq_platform_suspend (struct vchiq_state *state) {return VCHIQ_ERROR ; } -VCHIQ_STATUS_T +enum vchiq_status vchiq_platform_resume (struct vchiq_state *state) {return VCHIQ_SUCCESS ;
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c +40 -40
271 lines not on this page · raw message
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.h +9 -9
@@ -109,13 +109,13 @@ int vchiq_platform_init(struct platform_device *pdev,extern struct vchiq_state *vchiq_get_state (void ); -extern VCHIQ_STATUS_T +extern enum vchiq_status vchiq_arm_vcsuspend (struct vchiq_state *state); -extern VCHIQ_STATUS_T +extern enum vchiq_status vchiq_arm_vcresume (struct vchiq_state *state); -extern VCHIQ_STATUS_T +extern enum vchiq_status vchiq_arm_init_state (struct vchiq_state *state,struct vchiq_arm_state *arm_state);
@@ -124,16 +124,16 @@ vchiq_check_resume(struct vchiq_state *state);extern void vchiq_check_suspend (struct vchiq_state *state); -VCHIQ_STATUS_T +enum vchiq_status vchiq_use_service (VCHIQ_SERVICE_HANDLE_T handle); -extern VCHIQ_STATUS_T +extern enum vchiq_status vchiq_release_service (VCHIQ_SERVICE_HANDLE_T handle); -extern VCHIQ_STATUS_T +extern enum vchiq_status vchiq_check_service (struct vchiq_service *service); -extern VCHIQ_STATUS_T +extern enum vchiq_status vchiq_platform_suspend (struct vchiq_state *state); extern int
@@ -154,10 +154,10 @@ vchiq_platform_get_arm_state(struct vchiq_state *state);extern int vchiq_videocore_wanted (struct vchiq_state *state); -extern VCHIQ_STATUS_T +extern enum vchiq_status vchiq_use_internal (struct vchiq_state *state,struct vchiq_service *service,enum USE_TYPE_E use_type); -extern VCHIQ_STATUS_T +extern enum vchiq_status vchiq_release_internal (struct vchiq_state *state,struct vchiq_service *service);
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c +33 -33
229 lines not on this page · raw message
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h +14 -14
@@ -491,10 +491,10 @@ get_conn_state_name(VCHIQ_CONNSTATE_T conn_state);extern struct vchiq_slot_zero *vchiq_init_slots (void *mem_base,int mem_size); -extern VCHIQ_STATUS_T +extern enum vchiq_status vchiq_init_state (struct vchiq_state *state,struct vchiq_slot_zero *slot_zero); -extern VCHIQ_STATUS_T +extern enum vchiq_status vchiq_connect_internal (struct vchiq_state *state,VCHIQ_INSTANCE_T instance); extern struct vchiq_service *
@@ -503,10 +503,10 @@ vchiq_add_service_internal(struct vchiq_state *state, int srvstate, VCHIQ_INSTANCE_T instance, VCHIQ_USERDATA_TERM_T userdata_term); -extern VCHIQ_STATUS_T +extern enum vchiq_status vchiq_open_service_internal (struct vchiq_service *service,int client_id); -extern VCHIQ_STATUS_T +extern enum vchiq_status vchiq_close_service_internal (struct vchiq_service *service,int close_recvd); extern void
@@ -515,13 +515,13 @@ vchiq_terminate_service_internal(struct vchiq_service *service);extern void vchiq_free_service_internal (struct vchiq_service *service); -extern VCHIQ_STATUS_T +extern enum vchiq_status vchiq_shutdown_internal (struct vchiq_state *state,VCHIQ_INSTANCE_T instance);extern void remote_event_pollall (struct vchiq_state *state); -extern VCHIQ_STATUS_T +extern enum vchiq_status vchiq_bulk_transfer (VCHIQ_SERVICE_HANDLE_T handle,void *offset,int size,void *userdata,VCHIQ_BULK_MODE_T mode,VCHIQ_BULK_DIR_T dir);
@@ -580,7 +580,7 @@ unlock_service(struct vchiq_service *service);/* The following functions are called from vchiq_core, and external ** implementations must be provided. */ -extern VCHIQ_STATUS_T +extern enum vchiq_status vchiq_prepare_bulk_data (struct vchiq_bulk *bulk,void *offset,int size,int dir);
@@ -596,7 +596,7 @@ vchiq_platform_check_suspend(struct vchiq_state *state);extern void vchiq_platform_paused (struct vchiq_state *state); -extern VCHIQ_STATUS_T +extern enum vchiq_status vchiq_platform_resume (struct vchiq_state *state); extern void
@@ -615,10 +615,10 @@ extern voidvchiq_dump_platform_service_state (void *dump_context, struct vchiq_service *service); -extern VCHIQ_STATUS_T +extern enum vchiq_status vchiq_use_service_internal (struct vchiq_service *service); -extern VCHIQ_STATUS_T +extern enum vchiq_status vchiq_release_service_internal (struct vchiq_service *service); extern void
@@ -627,19 +627,19 @@ vchiq_on_remote_use(struct vchiq_state *state);extern void vchiq_on_remote_release (struct vchiq_state *state); -extern VCHIQ_STATUS_T +extern enum vchiq_status vchiq_platform_init_state (struct vchiq_state *state); -extern VCHIQ_STATUS_T +extern enum vchiq_status vchiq_check_service (struct vchiq_service *service);extern void vchiq_on_remote_use_active (struct vchiq_state *state); -extern VCHIQ_STATUS_T +extern enum vchiq_status vchiq_send_remote_use (struct vchiq_state *state); -extern VCHIQ_STATUS_T +extern enum vchiq_status vchiq_send_remote_use_active (struct vchiq_state *state); extern void
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_if.h +22 -22
93 lines not on this page · raw message
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_shim.c +10 -10
@@ -106,7 +106,7 @@ int32_t vchi_msg_queue(struct vchi_service_handle *handle, uint32_t data_size) {struct shim_service *service = (struct shim_service *)handle; -VCHIQ_STATUS_T status; +enum vchiq_status status;while (1 ) { status = vchiq_queue_message(service->handle,
@@ -204,7 +204,7 @@ int32_t vchi_bulk_queue_receive(struct vchi_service_handle *handle, void *data_d {struct shim_service *service = (struct shim_service *)handle;VCHIQ_BULK_MODE_T mode; -VCHIQ_STATUS_T status; +enum vchiq_status status;switch ((int )flags) { case VCHI_FLAGS_CALLBACK_WHEN_OP_COMPLETE
@@ -264,7 +264,7 @@ int32_t vchi_bulk_queue_transmit(struct vchi_service_handle *handle, {struct shim_service *service = (struct shim_service *)handle;VCHIQ_BULK_MODE_T mode; -VCHIQ_STATUS_T status; +enum vchiq_status status;switch ((int )flags) { case VCHI_FLAGS_CALLBACK_WHEN_OP_COMPLETE
@@ -441,7 +441,7 @@ EXPORT_SYMBOL(vchi_msg_hold);int32_t vchi_initialise (struct vchi_instance_handle **instance_handle) {VCHIQ_INSTANCE_T instance; -VCHIQ_STATUS_T status; +enum vchiq_status status; status =vchiq_initialise (&instance);
@@ -503,7 +503,7 @@ EXPORT_SYMBOL(vchi_disconnect);* ***********************************************************/ -static VCHIQ_STATUS_T shim_callback (enum vchiq_reason reason, +static enum vchiq_status shim_callback (enum vchiq_reason reason,struct vchiq_header *header,VCHIQ_SERVICE_HANDLE_T handle,void *bulk_user)
@@ -604,7 +604,7 @@ int32_t vchi_service_open(struct vchi_instance_handle *instance_handle,if (service) {struct vchiq_service_params params; -VCHIQ_STATUS_T status; +enum vchiq_status status;memset (¶ms,0 ,sizeof (params)); params.fourcc = setup->service_id;
@@ -632,7 +632,7 @@ int32_t vchi_service_close(const struct vchi_service_handle *handle)struct shim_service *service = (struct shim_service *)handle;if (service) { -VCHIQ_STATUS_T status =vchiq_close_service (service->handle); +enum vchiq_status status =vchiq_close_service (service->handle);if (status ==VCHIQ_SUCCESS )service_free (service);
@@ -648,7 +648,7 @@ int32_t vchi_service_destroy(const struct vchi_service_handle *handle)struct shim_service *service = (struct shim_service *)handle;if (service) { -VCHIQ_STATUS_T status =vchiq_remove_service (service->handle); +enum vchiq_status status =vchiq_remove_service (service->handle);if (status ==VCHIQ_SUCCESS ) {service_free (service);
@@ -681,7 +681,7 @@ int32_t vchi_service_set_option(const struct vchi_service_handle *handle,break ; }if (service) { -VCHIQ_STATUS_T status = +enum vchiq_status status =vchiq_set_service_option (service->handle, vchiq_option, value);
@@ -698,7 +698,7 @@ int32_t vchi_get_peer_version(const struct vchi_service_handle *handle, short *pstruct shim_service *service = (struct shim_service *)handle;if (service) { -VCHIQ_STATUS_T status; +enum vchiq_status status; status =vchiq_get_peer_version (service->handle, peer_version); ret =vchiq_status_to_vchi (status);
Signature · 1 line
2.17.1
Greg KH
maintainerRe: [PATCH v2 04/14] staging: vc04_services: Replace VCHIQ_STATUS_T enum typedef with enum vchiq_status
Quoted 1 line · Jamal Shareef
Replaces
VCHIQ_STATUS_Tenum typedef with enumvchiq_statusto match kernel code style. Issue found by checkpatch.
Please line-wrap your comments properly. I'll fix this up...
PATCH v2 5/14 staging: vc04_services: Replace VCHIQ_BULK_MODE_T enum typedef with enum vchiq_bulk_mode
In reply to Jamal ShareefReplaces VCHIQ_BULK_MODE_T enum typedef with enum vchiq_bulk_mode to match kernel code style. Issue found by checkpatch.
--- .../vc04_services/interface/vchiq_arm/vchiq_arm.c | 8 ++++---- .../vc04_services/interface/vchiq_arm/vchiq_core.c | 2 +- .../vc04_services/interface/vchiq_arm/vchiq_core.h | 2 +- .../vc04_services/interface/vchiq_arm/vchiq_if.h | 12 ++++++------ .../vc04_services/interface/vchiq_arm/vchiq_ioctl.h | 2 +- .../vc04_services/interface/vchiq_arm/vchiq_shim.c | 4 ++-- 6 files changed, 15 insertions(+), 15 deletions(-)
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c +4 -4
@@ -382,7 +382,7 @@ EXPORT_SYMBOL(vchiq_open_service);enum vchiq_status vchiq_bulk_transmit (VCHIQ_SERVICE_HANDLE_T handle,const void *data, -unsigned int size,void *userdata,VCHIQ_BULK_MODE_T mode) +unsigned int size,void *userdata,enum vchiq_bulk_mode mode) {enum vchiq_status status;
@@ -407,7 +407,7 @@ EXPORT_SYMBOL(vchiq_bulk_transmit);enum vchiq_status vchiq_bulk_receive (VCHIQ_SERVICE_HANDLE_T handle,void *data, -unsigned int size,void *userdata,VCHIQ_BULK_MODE_T mode) +unsigned int size,void *userdata,enum vchiq_bulk_mode mode) {enum vchiq_status status;
@@ -1107,7 +1107,7 @@ vchiq_ioctl(struct file *file, unsigned int cmd, unsigned long arg) }kfree (waiter); }else { -const VCHIQ_BULK_MODE_T mode_waiting = +const enum vchiq_bulk_mode mode_waiting =VCHIQ_BULK_MODE_WAITING ; waiter->pid = current->pid;mutex_lock (&instance->bulk_waiter_list_mutex);
@@ -1611,7 +1611,7 @@ struct vchiq_queue_bulk_transfer32 {compat_uptr_t data;unsigned int size;compat_uptr_t userdata; -VCHIQ_BULK_MODE_T mode; +enum vchiq_bulk_mode mode; };#define VCHIQ_IOC_QUEUE_BULK_TRANSMIT32 \
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c +1 -1
@@ -2954,7 +2954,7 @@ vchiq_remove_service(VCHIQ_SERVICE_HANDLE_T handle)*/ enum vchiq_status vchiq_bulk_transfer (VCHIQ_SERVICE_HANDLE_T handle,void *offset,int size,void *userdata, -VCHIQ_BULK_MODE_T mode, +enum vchiq_bulk_mode mode,VCHIQ_BULK_DIR_T dir) {struct vchiq_service *service =find_service_by_handle (handle);
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h +1 -1
@@ -523,7 +523,7 @@ remote_event_pollall(struct vchiq_state *state);extern enum vchiq_status vchiq_bulk_transfer (VCHIQ_SERVICE_HANDLE_T handle,void *offset,int size, -void *userdata,VCHIQ_BULK_MODE_T mode, +void *userdata,enum vchiq_bulk_mode mode,VCHIQ_BULK_DIR_T dir); extern void
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_if.h +6 -6
@@ -31,12 +31,12 @@ enum vchiq_status {VCHIQ_RETRY =1 }; -typedef enum { +enum vchiq_bulk_mode {VCHIQ_BULK_MODE_CALLBACK ,VCHIQ_BULK_MODE_BLOCKING ,VCHIQ_BULK_MODE_NOCALLBACK ,VCHIQ_BULK_MODE_WAITING /* Reserved for internal use */ -}VCHIQ_BULK_MODE_T ; +}; typedef enum { VCHIQ_SERVICE_OPTION_AUTOCLOSE,
@@ -118,16 +118,16 @@ extern void vchiq_release_message(VCHIQ_SERVICE_HANDLE_T service, struct vchiq_header *header);extern enum vchiq_status vchiq_bulk_transmit (VCHIQ_SERVICE_HANDLE_T service,const void *data,unsigned int size,void *userdata, -VCHIQ_BULK_MODE_T mode); +enum vchiq_bulk_mode mode);extern enum vchiq_status vchiq_bulk_receive (VCHIQ_SERVICE_HANDLE_T service,void *data,unsigned int size,void *userdata, -VCHIQ_BULK_MODE_T mode); +enum vchiq_bulk_mode mode);extern enum vchiq_status vchiq_bulk_transmit_handle (VCHIQ_SERVICE_HANDLE_T service,const void *offset,unsigned int size, -void *userdata,VCHIQ_BULK_MODE_T mode); +void *userdata,enum vchiq_bulk_mode mode);extern enum vchiq_status vchiq_bulk_receive_handle (VCHIQ_SERVICE_HANDLE_T service,void *offset,unsigned int size,void *userdata, -VCHIQ_BULK_MODE_T mode); +enum vchiq_bulk_mode mode);extern int vchiq_get_client_id (VCHIQ_SERVICE_HANDLE_T service);extern void *vchiq_get_service_userdata (VCHIQ_SERVICE_HANDLE_T service);extern int vchiq_get_service_fourcc (VCHIQ_SERVICE_HANDLE_T service);
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_ioctl.h +1 -1
@@ -28,7 +28,7 @@ struct vchiq_queue_bulk_transfer {void *data;unsigned int size;void *userdata; -VCHIQ_BULK_MODE_T mode; +enum vchiq_bulk_mode mode; };struct vchiq_completion_data {
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_shim.c +2 -2
@@ -203,7 +203,7 @@ int32_t vchi_bulk_queue_receive(struct vchi_service_handle *handle, void *data_d void *bulk_handle) {struct shim_service *service = (struct shim_service *)handle; -VCHIQ_BULK_MODE_T mode; +enum vchiq_bulk_mode mode;enum vchiq_status status;switch ((int )flags) {
@@ -263,7 +263,7 @@ int32_t vchi_bulk_queue_transmit(struct vchi_service_handle *handle, void *bulk_handle) {struct shim_service *service = (struct shim_service *)handle; -VCHIQ_BULK_MODE_T mode; +enum vchiq_bulk_mode mode;enum vchiq_status status;switch ((int )flags) {
Signature · 1 line
2.17.1
PATCH v2 6/14 staging: vc04_services: Replace VCHIQ_SERVICE_OPTION_T enum typedef with enum vchiq_service_option
In reply to Jamal ShareefReplaces VCHIQ_SERVICE_OPTION_T enum typedef with enum vchiq_service_option to match kernel code style. Issue found by checkpatch.
--- .../staging/vc04_services/interface/vchiq_arm/vchiq_core.c | 2 +- .../staging/vc04_services/interface/vchiq_arm/vchiq_if.h | 6 +++--- .../staging/vc04_services/interface/vchiq_arm/vchiq_ioctl.h | 2 +- .../staging/vc04_services/interface/vchiq_arm/vchiq_shim.c | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-)
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c +1 -1
@@ -3223,7 +3223,7 @@ void vchiq_get_config(struct vchiq_config *config)enum vchiq_status vchiq_set_service_option (VCHIQ_SERVICE_HANDLE_T handle, -VCHIQ_SERVICE_OPTION_T option,int value) +enum vchiq_service_option option,int value) {struct vchiq_service *service =find_service_by_handle (handle);enum vchiq_status status =VCHIQ_ERROR ;
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_if.h +3 -3
@@ -38,13 +38,13 @@ enum vchiq_bulk_mode {VCHIQ_BULK_MODE_WAITING /* Reserved for internal use */ }; -typedef enum { +enum vchiq_service_option {VCHIQ_SERVICE_OPTION_AUTOCLOSE ,VCHIQ_SERVICE_OPTION_SLOT_QUOTA ,VCHIQ_SERVICE_OPTION_MESSAGE_QUOTA ,VCHIQ_SERVICE_OPTION_SYNCHRONOUS ,VCHIQ_SERVICE_OPTION_TRACE -}VCHIQ_SERVICE_OPTION_T ; +};struct vchiq_header {/* The message identifier - opaque to applications. */
@@ -133,7 +133,7 @@ extern void *vchiq_get_service_userdata(VCHIQ_SERVICE_HANDLE_T service);extern int vchiq_get_service_fourcc (VCHIQ_SERVICE_HANDLE_T service);extern void vchiq_get_config (struct vchiq_config *config);extern enum vchiq_status vchiq_set_service_option (VCHIQ_SERVICE_HANDLE_T service, -VCHIQ_SERVICE_OPTION_T option,int value); +enum vchiq_service_option option,int value);extern enum vchiq_status vchiq_remote_use (VCHIQ_INSTANCE_T instance,VCHIQ_REMOTE_USE_CALLBACK_T callback,void *cb_arg);
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_ioctl.h +1 -1
@@ -60,7 +60,7 @@ struct vchiq_get_config {struct vchiq_set_service_option {unsigned int handle; -VCHIQ_SERVICE_OPTION_T option; +enum vchiq_service_option option;int value; };
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_shim.c +1 -1
@@ -667,7 +667,7 @@ int32_t vchi_service_set_option(const struct vchi_service_handle *handle, {int32_t ret =-1 ;struct shim_service *service = (struct shim_service *)handle; -VCHIQ_SERVICE_OPTION_T vchiq_option; +enum vchiq_service_option vchiq_option;switch (option) {case VCHI_SERVICE_OPTION_TRACE :
Signature · 1 line
2.17.1
PATCH v2 7/14 staging: vc04_services: Replace VCHIQ_CONNSTATE_T enum typedef with enum vchiq_connstate
In reply to Jamal ShareefReplaces VCHIQ_CONNSTATE_T enum typedef with enum vchiq_connstate to match kernel code style. Issue found by checkpatch.
--- .../vc04_services/interface/vchiq_arm/vchiq_arm.c | 4 ++-- .../vc04_services/interface/vchiq_arm/vchiq_core.c | 6 +++--- .../vc04_services/interface/vchiq_arm/vchiq_core.h | 14 +++++++------- 3 files changed, 12 insertions(+), 12 deletions(-)
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c +2 -2
@@ -3128,8 +3128,8 @@ void vchiq_on_remote_use_active(struct vchiq_state *state) }void vchiq_platform_conn_state_changed (struct vchiq_state *state, -VCHIQ_CONNSTATE_T oldstate, -VCHIQ_CONNSTATE_T newstate) +enum vchiq_connstate oldstate, +enum vchiq_connstate newstate) {struct vchiq_arm_state *arm_state =vchiq_platform_get_arm_state (state);
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c +3 -3
@@ -375,9 +375,9 @@ make_service_callback(struct vchiq_service *service, enum vchiq_reason reason, }inline void -vchiq_set_conn_state (struct vchiq_state *state,VCHIQ_CONNSTATE_T newstate) +vchiq_set_conn_state (struct vchiq_state *state,enum vchiq_connstate newstate) { -VCHIQ_CONNSTATE_T oldstate = state->conn_state; +enum vchiq_connstate oldstate = state->conn_state; vchiq_log_info(vchiq_core_log_level, "%d: %s->%s", state->id, conn_state_names[oldstate],
@@ -2078,7 +2078,7 @@ init_bulk_queue(struct vchiq_bulk_queue *queue) }inline const char * -get_conn_state_name (VCHIQ_CONNSTATE_T conn_state) +get_conn_state_name (enum vchiq_connstate conn_state) {return conn_state_names[conn_state]; }
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h +7 -7
@@ -169,7 +169,7 @@ enum {#endif /* VCHIQ_ENABLE_DEBUG */ -typedef enum { +enum vchiq_connstate {VCHIQ_CONNSTATE_DISCONNECTED ,VCHIQ_CONNSTATE_CONNECTING ,VCHIQ_CONNSTATE_CONNECTED ,
@@ -179,7 +179,7 @@ typedef enum {VCHIQ_CONNSTATE_RESUMING ,VCHIQ_CONNSTATE_PAUSE_TIMEOUT ,VCHIQ_CONNSTATE_RESUME_TIMEOUT -}VCHIQ_CONNSTATE_T ; +};enum { VCHIQ_SRVSTATE_FREE,
@@ -367,7 +367,7 @@ struct vchiq_slot_zero {struct vchiq_state {int id;int initialised; -VCHIQ_CONNSTATE_T conn_state; +enum vchiq_connstate conn_state;short version_common;struct vchiq_shared_state *local;
@@ -486,7 +486,7 @@ extern int vchiq_sync_log_level;extern struct vchiq_state *vchiq_states[VCHIQ_MAX_STATES ];extern const char * -get_conn_state_name (VCHIQ_CONNSTATE_T conn_state); +get_conn_state_name (enum vchiq_connstate conn_state);extern struct vchiq_slot_zero *vchiq_init_slots (void *mem_base,int mem_size);
@@ -644,14 +644,14 @@ vchiq_send_remote_use_active(struct vchiq_state *state);extern void vchiq_platform_conn_state_changed (struct vchiq_state *state, -VCHIQ_CONNSTATE_T oldstate, -VCHIQ_CONNSTATE_T newstate); +enum vchiq_connstate oldstate, +enum vchiq_connstate newstate);extern void vchiq_platform_handle_timeout (struct vchiq_state *state);extern void -vchiq_set_conn_state (struct vchiq_state *state,VCHIQ_CONNSTATE_T newstate); +vchiq_set_conn_state (struct vchiq_state *state,enum vchiq_connstate newstate); extern void vchiq_log_dump_mem(const char *label, uint32_t addr, const void *voidMem,
Signature · 1 line
2.17.1
PATCH v2 8/14 staging: vc04_services: Replace VCHIQ_BULK_DIR_T enum typedef with enum vchiq_bulk_dir
In reply to Jamal ShareefReplaces VCHIQ_BULK_DIR_T enum typedef with enum vchiq_bulk_dir to match kernel code style. Issue found by checkpatch.
--- .../staging/vc04_services/interface/vchiq_arm/vchiq_arm.c | 6 +++--- .../staging/vc04_services/interface/vchiq_arm/vchiq_core.c | 2 +- .../staging/vc04_services/interface/vchiq_arm/vchiq_core.h | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-)
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c +3 -3
@@ -174,7 +174,7 @@ vchiq_static_assert(ARRAY_SIZE(ioctl_names) ==static enum vchiq_status vchiq_blocking_bulk_transfer (VCHIQ_SERVICE_HANDLE_T handle,void *data, -unsigned int size,VCHIQ_BULK_DIR_T dir); +unsigned int size,enum vchiq_bulk_dir dir);#define VCHIQ_INIT_RETRIES 10enum vchiq_status vchiq_initialise (VCHIQ_INSTANCE_T *instance_out)
@@ -431,7 +431,7 @@ EXPORT_SYMBOL(vchiq_bulk_receive);static enum vchiq_status vchiq_blocking_bulk_transfer (VCHIQ_SERVICE_HANDLE_T handle,void *data, -unsigned int size,VCHIQ_BULK_DIR_T dir) +unsigned int size,enum vchiq_bulk_dir dir) {VCHIQ_INSTANCE_T instance;struct vchiq_service *service;
@@ -1042,7 +1042,7 @@ vchiq_ioctl(struct file *file, unsigned int cmd, unsigned long arg)struct vchiq_queue_bulk_transfer args;struct bulk_waiter_node *waiter =NULL ; -VCHIQ_BULK_DIR_T dir = +enum vchiq_bulk_dir dir = (cmd ==VCHIQ_IOC_QUEUE_BULK_TRANSMIT ) ?VCHIQ_BULK_TRANSMIT :VCHIQ_BULK_RECEIVE ;
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c +1 -1
@@ -2955,7 +2955,7 @@ vchiq_remove_service(VCHIQ_SERVICE_HANDLE_T handle)enum vchiq_status vchiq_bulk_transfer (VCHIQ_SERVICE_HANDLE_T handle,void *offset,int size,void *userdata,enum vchiq_bulk_mode mode, -VCHIQ_BULK_DIR_T dir) +enum vchiq_bulk_dir dir) {struct vchiq_service *service =find_service_by_handle (handle);struct vchiq_bulk_queue *queue;
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h +3 -3
@@ -202,10 +202,10 @@ enum { VCHIQ_POLL_COUNT }; -typedef enum { +enum vchiq_bulk_dir {VCHIQ_BULK_TRANSMIT ,VCHIQ_BULK_RECEIVE -}VCHIQ_BULK_DIR_T ; +};typedef void (*VCHIQ_USERDATA_TERM_T )(void *userdata);
@@ -524,7 +524,7 @@ remote_event_pollall(struct vchiq_state *state);extern enum vchiq_status vchiq_bulk_transfer (VCHIQ_SERVICE_HANDLE_T handle,void *offset,int size,void *userdata,enum vchiq_bulk_mode mode, -VCHIQ_BULK_DIR_T dir); +enum vchiq_bulk_dir dir);extern void vchiq_dump_state (void *dump_context,struct vchiq_state *state);
Signature · 1 line
2.17.1
PATCH v2 9/14 staging: vc04_services: Rename callback VCHIQ_USERDATA_TERM_T to vchiq_userdata_term
In reply to Jamal ShareefRenames callback VCHIQ_USERDATA_TERM_T to vchiq_userdata_term to match kernel code style.
--- .../staging/vc04_services/interface/vchiq_arm/vchiq_core.c | 2 +- .../staging/vc04_services/interface/vchiq_arm/vchiq_core.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-)
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c +1 -1
@@ -2281,7 +2281,7 @@ struct vchiq_service * vchiq_add_service_internal(struct vchiq_state *state, const struct vchiq_service_params *params, int srvstate, VCHIQ_INSTANCE_T instance, - VCHIQ_USERDATA_TERM_T userdata_term) + vchiq_userdata_term userdata_term) { struct vchiq_service *service;struct vchiq_service **pservice =NULL ;
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h +3 -3
@@ -207,7 +207,7 @@ enum vchiq_bulk_dir {VCHIQ_BULK_RECEIVE }; -typedef void (*VCHIQ_USERDATA_TERM_T )(void *userdata); +typedef void (*vchiq_userdata_term )(void *userdata);struct vchiq_bulk {short mode;
@@ -253,7 +253,7 @@ struct vchiq_service {VCHIQ_SERVICE_HANDLE_T handle;unsigned int ref_count;int srvstate; -VCHIQ_USERDATA_TERM_T userdata_term; +vchiq_userdata_term userdata_term;unsigned int localport;unsigned int remoteport;int public_fourcc;
@@ -501,7 +501,7 @@ extern struct vchiq_service * vchiq_add_service_internal(struct vchiq_state *state, const struct vchiq_service_params *params, int srvstate, VCHIQ_INSTANCE_T instance, - VCHIQ_USERDATA_TERM_T userdata_term); + vchiq_userdata_term userdata_term);extern enum vchiq_status vchiq_open_service_internal (struct vchiq_service *service,int client_id);
Signature · 1 line
2.17.1
PATCH v2 10/14 staging: vc04_services: Rename VCHIQ_CALLBACK_T to vchiq_callback
In reply to Jamal ShareefRenames VCHIQ_CALLBACK_T to vchiq_callback to match kernel code style.
--- .../vc04_services/interface/vchiq_arm/vchiq_if.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_if.h +5 -5
@@ -63,19 +63,19 @@ struct vchiq_element {typedef unsigned int VCHIQ_SERVICE_HANDLE_T ; -typedef enum vchiq_status (*VCHIQ_CALLBACK_T )(enum vchiq_reason , -struct vchiq_header *, -VCHIQ_SERVICE_HANDLE_T ,void *); +typedef enum vchiq_status (*vchiq_callback )(enum vchiq_reason , +struct vchiq_header *, +VCHIQ_SERVICE_HANDLE_T ,void *);struct vchiq_service_base {int fourcc; -VCHIQ_CALLBACK_T callback; +vchiq_callback callback;void *userdata; };struct vchiq_service_params {int fourcc; -VCHIQ_CALLBACK_T callback; +vchiq_callback callback;void *userdata;short version;/* Increment for non-trivial changes */ short version_min;/* Update for incompatible changes */
Signature · 1 line
2.17.1
PATCH v2 11/14 staging: vc04_services: Rename VCHIQ_REMOTE_USE_CALLBACK_T to vchiq_remote_callback
In reply to Jamal ShareefRenames VCHIQ_REMOTE_USE_CALLBACK_T to vchiq_remote_callback to match kernel code style.
--- drivers/staging/vc04_services/interface/vchiq_arm/vchiq_if.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_if.h +2 -2
@@ -93,7 +93,7 @@ struct vchiq_config { };typedef struct vchiq_instance_struct *VCHIQ_INSTANCE_T ; -typedef void (*VCHIQ_REMOTE_USE_CALLBACK_T )(void *cb_arg); +typedef void (*vchiq_remote_callback )(void *cb_arg);extern enum vchiq_status vchiq_initialise (VCHIQ_INSTANCE_T *pinstance);extern enum vchiq_status vchiq_shutdown (VCHIQ_INSTANCE_T instance);
@@ -136,7 +136,7 @@ extern enum vchiq_status vchiq_set_service_option(VCHIQ_SERVICE_HANDLE_T service enum vchiq_service_option option, int value);extern enum vchiq_status vchiq_remote_use (VCHIQ_INSTANCE_T instance, -VCHIQ_REMOTE_USE_CALLBACK_T callback,void *cb_arg); +vchiq_remote_callback callback,void *cb_arg);extern enum vchiq_status vchiq_remote_release (VCHIQ_INSTANCE_T instance); extern enum vchiq_status vchiq_dump_phys_mem(VCHIQ_SERVICE_HANDLE_T service,
Signature · 1 line
2.17.1
PATCH v2 12/14 staging: vc04_services: Replace VCHIQ_SERVICE_HANDLE_T typedef with unsigned int
In reply to Jamal ShareefReplaces VCHIQ_SERVICE_HANDLE_T typedef with unsigned int to match kernel code style. Issue found by checkpatch.
--- .../interface/vchiq_arm/vchiq_arm.c | 32 +++++++-------- .../interface/vchiq_arm/vchiq_arm.h | 4 +- .../interface/vchiq_arm/vchiq_core.c | 26 ++++++------ .../interface/vchiq_arm/vchiq_core.h | 12 +++--- .../interface/vchiq_arm/vchiq_if.h | 40 +++++++++---------- .../interface/vchiq_arm/vchiq_shim.c | 10 ++--- 6 files changed, 61 insertions(+), 63 deletions(-)
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c +16 -16
@@ -173,7 +173,7 @@ vchiq_static_assert(ARRAY_SIZE(ioctl_names) == (VCHIQ_IOC_MAX + 1));static enum vchiq_status -vchiq_blocking_bulk_transfer (VCHIQ_SERVICE_HANDLE_T handle,void *data, +vchiq_blocking_bulk_transfer (unsigned int handle,void *data,unsigned int size,enum vchiq_bulk_dir dir);#define VCHIQ_INIT_RETRIES 10
@@ -304,7 +304,7 @@ EXPORT_SYMBOL(vchiq_connect);enum vchiq_status vchiq_add_service (VCHIQ_INSTANCE_T instance,const struct vchiq_service_params *params, -VCHIQ_SERVICE_HANDLE_T *phandle) +unsigned int *phandle) {enum vchiq_status status;struct vchiq_state *state = instance->state;
@@ -343,7 +343,7 @@ EXPORT_SYMBOL(vchiq_add_service);enum vchiq_status vchiq_open_service (VCHIQ_INSTANCE_T instance,const struct vchiq_service_params *params, -VCHIQ_SERVICE_HANDLE_T *phandle) +unsigned int *phandle) {enum vchiq_status status =VCHIQ_ERROR ;struct vchiq_state *state = instance->state;
@@ -381,7 +381,7 @@ enum vchiq_status vchiq_open_service(EXPORT_SYMBOL (vchiq_open_service);enum vchiq_status -vchiq_bulk_transmit (VCHIQ_SERVICE_HANDLE_T handle,const void *data, +vchiq_bulk_transmit (unsigned int handle,const void *data,unsigned int size,void *userdata,enum vchiq_bulk_mode mode) {enum vchiq_status status;
@@ -406,7 +406,7 @@ vchiq_bulk_transmit(VCHIQ_SERVICE_HANDLE_T handle, const void *data,EXPORT_SYMBOL (vchiq_bulk_transmit);enum vchiq_status -vchiq_bulk_receive (VCHIQ_SERVICE_HANDLE_T handle,void *data, +vchiq_bulk_receive (unsigned int handle,void *data,unsigned int size,void *userdata,enum vchiq_bulk_mode mode) {enum vchiq_status status;
@@ -430,7 +430,7 @@ vchiq_bulk_receive(VCHIQ_SERVICE_HANDLE_T handle, void *data,EXPORT_SYMBOL (vchiq_bulk_receive);static enum vchiq_status -vchiq_blocking_bulk_transfer (VCHIQ_SERVICE_HANDLE_T handle,void *data, +vchiq_blocking_bulk_transfer (unsigned int handle,void *data,unsigned int size,enum vchiq_bulk_dir dir) {VCHIQ_INSTANCE_T instance;
@@ -584,7 +584,7 @@ add_completion(VCHIQ_INSTANCE_T instance, enum vchiq_reason reason,static enum vchiq_status service_callback (enum vchiq_reason reason,struct vchiq_header *header, -VCHIQ_SERVICE_HANDLE_T handle,void *bulk_userdata) +unsigned int handle,void *bulk_userdata) {/* How do we ensure the callback goes to the right client? ** The service_user data points to a user_service record
@@ -773,7 +773,7 @@ static ssize_t vchiq_ioc_copy_element_data(void *context, void *dest,* **************************************************************************/ static enum vchiq_status -vchiq_ioc_queue_message (VCHIQ_SERVICE_HANDLE_T handle, +vchiq_ioc_queue_message (unsigned int handle,struct vchiq_element *elements,unsigned long count) {
@@ -952,7 +952,7 @@ vchiq_ioctl(struct file *file, unsigned int cmd, unsigned long arg)case VCHIQ_IOC_CLOSE_SERVICE :case VCHIQ_IOC_REMOVE_SERVICE : { -VCHIQ_SERVICE_HANDLE_T handle = (VCHIQ_SERVICE_HANDLE_T )arg; +unsigned int handle = (unsigned int )arg;struct user_service *user_service; service =find_service_for_instance (instance, handle);
@@ -985,7 +985,7 @@ vchiq_ioctl(struct file *file, unsigned int cmd, unsigned long arg)case VCHIQ_IOC_USE_SERVICE :case VCHIQ_IOC_RELEASE_SERVICE : { -VCHIQ_SERVICE_HANDLE_T handle = (VCHIQ_SERVICE_HANDLE_T )arg; +unsigned int handle = (unsigned int )arg; service =find_service_for_instance (instance, handle);if (service) {
@@ -1368,7 +1368,7 @@ vchiq_ioctl(struct file *file, unsigned int cmd, unsigned long arg) }break ;case VCHIQ_IOC_GET_CLIENT_ID : { -VCHIQ_SERVICE_HANDLE_T handle = (VCHIQ_SERVICE_HANDLE_T )arg; +unsigned int handle = (unsigned int )arg; ret =vchiq_get_client_id (handle); }break ;
@@ -1423,7 +1423,7 @@ vchiq_ioctl(struct file *file, unsigned int cmd, unsigned long arg) }break ;case VCHIQ_IOC_CLOSE_DELIVERED : { -VCHIQ_SERVICE_HANDLE_T handle = (VCHIQ_SERVICE_HANDLE_T )arg; +unsigned int handle = (unsigned int )arg; service =find_closed_service_for_instance (instance, handle);if (service) {
@@ -2273,7 +2273,7 @@ vchiq_videocore_wanted(struct vchiq_state *state)static enum vchiq_status vchiq_keepalive_vchiq_callback (enum vchiq_reason reason,struct vchiq_header *header, -VCHIQ_SERVICE_HANDLE_T service_user, +unsigned int service_user,void *bulk_user) { vchiq_log_error(vchiq_susp_log_level,
@@ -2289,7 +2289,7 @@ vchiq_keepalive_thread_func(void *v)enum vchiq_status status;VCHIQ_INSTANCE_T instance; -VCHIQ_SERVICE_HANDLE_T ka_handle; +unsigned int ka_handle;struct vchiq_service_params params = { .fourcc =VCHIQ_MAKE_FOURCC ('K' ,'E' ,'E' ,'P' ),
@@ -2970,7 +2970,7 @@ static void suspend_timer_callback(struct timer_list *t) }enum vchiq_status -vchiq_use_service (VCHIQ_SERVICE_HANDLE_T handle) +vchiq_use_service (unsigned int handle) {enum vchiq_status ret =VCHIQ_ERROR ;struct vchiq_service *service =find_service_by_handle (handle);
@@ -2984,7 +2984,7 @@ vchiq_use_service(VCHIQ_SERVICE_HANDLE_T handle) }enum vchiq_status -vchiq_release_service (VCHIQ_SERVICE_HANDLE_T handle) +vchiq_release_service (unsigned int handle) {enum vchiq_status ret =VCHIQ_ERROR ;struct vchiq_service *service =find_service_by_handle (handle);
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.h +2 -2
@@ -125,10 +125,10 @@ vchiq_check_resume(struct vchiq_state *state);extern void vchiq_check_suspend (struct vchiq_state *state);enum vchiq_status -vchiq_use_service (VCHIQ_SERVICE_HANDLE_T handle); +vchiq_use_service (unsigned int handle);extern enum vchiq_status -vchiq_release_service (VCHIQ_SERVICE_HANDLE_T handle); +vchiq_release_service (unsigned int handle);extern enum vchiq_status vchiq_check_service (struct vchiq_service *service);
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c +13 -13
@@ -132,7 +132,7 @@ vchiq_set_service_state(struct vchiq_service *service, int newstate) }struct vchiq_service * -find_service_by_handle (VCHIQ_SERVICE_HANDLE_T handle) +find_service_by_handle (unsigned int handle) {struct vchiq_service *service;
@@ -178,7 +178,7 @@ find_service_by_port(struct vchiq_state *state, int localport)struct vchiq_service *find_service_for_instance (VCHIQ_INSTANCE_T instance, -VCHIQ_SERVICE_HANDLE_T handle) +unsigned int handle) {struct vchiq_service *service;
@@ -202,7 +202,7 @@ find_service_for_instance(VCHIQ_INSTANCE_T instance,struct vchiq_service *find_closed_service_for_instance (VCHIQ_INSTANCE_T instance, -VCHIQ_SERVICE_HANDLE_T handle) +unsigned int handle) {struct vchiq_service *service;
@@ -295,7 +295,7 @@ unlock_service(struct vchiq_service *service) }int -vchiq_get_client_id (VCHIQ_SERVICE_HANDLE_T handle) +vchiq_get_client_id (unsigned int handle) {struct vchiq_service *service =find_service_by_handle (handle);int id;
@@ -308,7 +308,7 @@ vchiq_get_client_id(VCHIQ_SERVICE_HANDLE_T handle) }void * -vchiq_get_service_userdata (VCHIQ_SERVICE_HANDLE_T handle) +vchiq_get_service_userdata (unsigned int handle) {struct vchiq_service *service =handle_to_service (handle);
@@ -316,7 +316,7 @@ vchiq_get_service_userdata(VCHIQ_SERVICE_HANDLE_T handle) }int -vchiq_get_service_fourcc (VCHIQ_SERVICE_HANDLE_T handle) +vchiq_get_service_fourcc (unsigned int handle) {struct vchiq_service *service =handle_to_service (handle);
@@ -2828,7 +2828,7 @@ vchiq_shutdown_internal(struct vchiq_state *state, VCHIQ_INSTANCE_T instance) }enum vchiq_status -vchiq_close_service (VCHIQ_SERVICE_HANDLE_T handle) +vchiq_close_service (unsigned int handle) {/* Unregister the service */ struct vchiq_service *service =find_service_by_handle (handle);
@@ -2887,7 +2887,7 @@ vchiq_close_service(VCHIQ_SERVICE_HANDLE_T handle) }enum vchiq_status -vchiq_remove_service (VCHIQ_SERVICE_HANDLE_T handle) +vchiq_remove_service (unsigned int handle) {/* Unregister the service */ struct vchiq_service *service =find_service_by_handle (handle);
@@ -2952,7 +2952,7 @@ vchiq_remove_service(VCHIQ_SERVICE_HANDLE_T handle)* When called in blocking mode, the userdata field points to a bulk_waiter * structure. */ -enum vchiq_status vchiq_bulk_transfer (VCHIQ_SERVICE_HANDLE_T handle, +enum vchiq_status vchiq_bulk_transfer (unsigned int handle,void *offset,int size,void *userdata,enum vchiq_bulk_mode mode,enum vchiq_bulk_dir dir)
@@ -3101,7 +3101,7 @@ enum vchiq_status vchiq_bulk_transfer(VCHIQ_SERVICE_HANDLE_T handle, } enum vchiq_status -vchiq_queue_message(VCHIQ_SERVICE_HANDLE_T handle, +vchiq_queue_message(unsigned int handle, ssize_t (*copy_callback)(void *context, void *dest, size_t offset, size_t maxsize), void *context,
@@ -3153,7 +3153,7 @@ vchiq_queue_message(VCHIQ_SERVICE_HANDLE_T handle, }void -vchiq_release_message (VCHIQ_SERVICE_HANDLE_T handle, +vchiq_release_message (unsigned int handle,struct vchiq_header *header) {struct vchiq_service *service =find_service_by_handle (handle);
@@ -3193,7 +3193,7 @@ release_message_sync(struct vchiq_state *state, struct vchiq_header *header) }enum vchiq_status -vchiq_get_peer_version (VCHIQ_SERVICE_HANDLE_T handle,short *peer_version) +vchiq_get_peer_version (unsigned int handle,short *peer_version) {enum vchiq_status status =VCHIQ_ERROR ;struct vchiq_service *service =find_service_by_handle (handle);
@@ -3222,7 +3222,7 @@ void vchiq_get_config(struct vchiq_config *config) }enum vchiq_status -vchiq_set_service_option (VCHIQ_SERVICE_HANDLE_T handle, +vchiq_set_service_option (unsigned int handle,enum vchiq_service_option option,int value) {struct vchiq_service *service =find_service_by_handle (handle);
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h +6 -6
@@ -250,7 +250,7 @@ struct vchiq_slot_info {struct vchiq_service {struct vchiq_service_base base; -VCHIQ_SERVICE_HANDLE_T handle; +unsigned int handle;unsigned int ref_count;int srvstate;vchiq_userdata_term userdata_term;
@@ -522,7 +522,7 @@ extern void remote_event_pollall(struct vchiq_state *state);extern enum vchiq_status -vchiq_bulk_transfer (VCHIQ_SERVICE_HANDLE_T handle,void *offset,int size, +vchiq_bulk_transfer (unsigned int handle,void *offset,int size,void *userdata,enum vchiq_bulk_mode mode,enum vchiq_bulk_dir dir);
@@ -543,7 +543,7 @@ request_poll(struct vchiq_state *state, struct vchiq_service *service, int poll_type);static inline struct vchiq_service * -handle_to_service (VCHIQ_SERVICE_HANDLE_T handle) +handle_to_service (unsigned int handle) {struct vchiq_state *state = vchiq_states[(handle /VCHIQ_MAX_SERVICES ) & (VCHIQ_MAX_STATES -1 )];
@@ -554,18 +554,18 @@ handle_to_service(VCHIQ_SERVICE_HANDLE_T handle) }extern struct vchiq_service * -find_service_by_handle (VCHIQ_SERVICE_HANDLE_T handle); +find_service_by_handle (unsigned int handle);extern struct vchiq_service *find_service_by_port (struct vchiq_state *state,int localport);extern struct vchiq_service *find_service_for_instance (VCHIQ_INSTANCE_T instance, -VCHIQ_SERVICE_HANDLE_T handle); +unsigned int handle);extern struct vchiq_service *find_closed_service_for_instance (VCHIQ_INSTANCE_T instance, -VCHIQ_SERVICE_HANDLE_T handle); +unsigned int handle);extern struct vchiq_service * next_service_by_instance(struct vchiq_state *state, VCHIQ_INSTANCE_T instance,
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_if.h +19 -21
@@ -61,11 +61,9 @@ struct vchiq_element {unsigned int size; }; -typedef unsigned int VCHIQ_SERVICE_HANDLE_T ; -typedef enum vchiq_status (*vchiq_callback )(enum vchiq_reason ,struct vchiq_header *, -VCHIQ_SERVICE_HANDLE_T ,void *); +unsigned int ,void *);struct vchiq_service_base {int fourcc;
@@ -100,49 +98,49 @@ extern enum vchiq_status vchiq_shutdown(VCHIQ_INSTANCE_T instance);extern enum vchiq_status vchiq_connect (VCHIQ_INSTANCE_T instance);extern enum vchiq_status vchiq_add_service (VCHIQ_INSTANCE_T instance,const struct vchiq_service_params *params, -VCHIQ_SERVICE_HANDLE_T *pservice); +unsigned int *pservice);extern enum vchiq_status vchiq_open_service (VCHIQ_INSTANCE_T instance,const struct vchiq_service_params *params, -VCHIQ_SERVICE_HANDLE_T *pservice); -extern enum vchiq_status vchiq_close_service (VCHIQ_SERVICE_HANDLE_T service); -extern enum vchiq_status vchiq_remove_service (VCHIQ_SERVICE_HANDLE_T service); -extern enum vchiq_status vchiq_use_service (VCHIQ_SERVICE_HANDLE_T service); -extern enum vchiq_status vchiq_release_service (VCHIQ_SERVICE_HANDLE_T service); +unsigned int *pservice); +extern enum vchiq_status vchiq_close_service (unsigned int service); +extern enum vchiq_status vchiq_remove_service (unsigned int service); +extern enum vchiq_status vchiq_use_service (unsigned int service); +extern enum vchiq_status vchiq_release_service (unsigned int service);extern enum vchiq_status -vchiq_queue_message (VCHIQ_SERVICE_HANDLE_T handle, +vchiq_queue_message (unsigned int handle,ssize_t (*copy_callback)(void *context,void *dest,size_t offset,size_t maxsize),void *context,size_t size); -extern void vchiq_release_message (VCHIQ_SERVICE_HANDLE_T service, +extern void vchiq_release_message (unsigned int service,struct vchiq_header *header); -extern enum vchiq_status vchiq_bulk_transmit (VCHIQ_SERVICE_HANDLE_T service, +extern enum vchiq_status vchiq_bulk_transmit (unsigned int service,const void *data,unsigned int size,void *userdata,enum vchiq_bulk_mode mode); -extern enum vchiq_status vchiq_bulk_receive (VCHIQ_SERVICE_HANDLE_T service, +extern enum vchiq_status vchiq_bulk_receive (unsigned int service,void *data,unsigned int size,void *userdata,enum vchiq_bulk_mode mode); -extern enum vchiq_status vchiq_bulk_transmit_handle (VCHIQ_SERVICE_HANDLE_T service, +extern enum vchiq_status vchiq_bulk_transmit_handle (unsigned int service,const void *offset,unsigned int size,void *userdata,enum vchiq_bulk_mode mode); -extern enum vchiq_status vchiq_bulk_receive_handle (VCHIQ_SERVICE_HANDLE_T service, +extern enum vchiq_status vchiq_bulk_receive_handle (unsigned int service,void *offset,unsigned int size,void *userdata,enum vchiq_bulk_mode mode); -extern int vchiq_get_client_id (VCHIQ_SERVICE_HANDLE_T service); -extern void *vchiq_get_service_userdata (VCHIQ_SERVICE_HANDLE_T service); -extern int vchiq_get_service_fourcc (VCHIQ_SERVICE_HANDLE_T service); +extern int vchiq_get_client_id (unsigned int service); +extern void *vchiq_get_service_userdata (unsigned int service); +extern int vchiq_get_service_fourcc (unsigned int service);extern void vchiq_get_config (struct vchiq_config *config); -extern enum vchiq_status vchiq_set_service_option (VCHIQ_SERVICE_HANDLE_T service, +extern enum vchiq_status vchiq_set_service_option (unsigned int service,enum vchiq_service_option option,int value);extern enum vchiq_status vchiq_remote_use (VCHIQ_INSTANCE_T instance,vchiq_remote_callback callback,void *cb_arg);extern enum vchiq_status vchiq_remote_release (VCHIQ_INSTANCE_T instance); -extern enum vchiq_status vchiq_dump_phys_mem (VCHIQ_SERVICE_HANDLE_T service, +extern enum vchiq_status vchiq_dump_phys_mem (unsigned int service,void *ptr,size_t num_bytes); -extern enum vchiq_status vchiq_get_peer_version (VCHIQ_SERVICE_HANDLE_T handle, +extern enum vchiq_status vchiq_get_peer_version (unsigned int handle,short *peer_version);#endif /* VCHIQ_IF_H */
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_shim.c +5 -5
@@ -12,7 +12,7 @@#define vchiq_status_to_vchi (status) ((int32_t)status)struct shim_service { -VCHIQ_SERVICE_HANDLE_T handle; +unsigned int handle;struct vchiu_queue queue;
@@ -360,13 +360,13 @@ int32_t vchi_held_msg_release(struct vchi_held_msg *message) {/* * Convert the service field pointer back to an -* VCHIQ_SERVICE_HANDLE_T which is an int. +* unsigned int which is an int. * This pointer is opaque to everything except * vchi_msg_hold which simply upcasted the int * to a pointer. */ -vchiq_release_message ((VCHIQ_SERVICE_HANDLE_T )(long )message->service, +vchiq_release_message ((unsigned int )(long )message->service, (struct vchiq_header *)message->message);return 0 ;
@@ -410,7 +410,7 @@ int32_t vchi_msg_hold(struct vchi_service_handle *handle, void **data, *msg_size = header->size;/* -* upcast the VCHIQ_SERVICE_HANDLE_T which is an int +* upcast the unsigned int which is an int * to a pointer and stuff it in the held message. * This pointer is opaque to everything except * vchi_held_msg_release which simply downcasts it back
@@ -505,7 +505,7 @@ EXPORT_SYMBOL(vchi_disconnect);static enum vchiq_status shim_callback (enum vchiq_reason reason,struct vchiq_header *header, -VCHIQ_SERVICE_HANDLE_T handle, +unsigned int handle,void *bulk_user) { struct shim_service *service =
Signature · 1 line
2.17.1
PATCH v2 13/14 staging: vc04_services: Replace VCHIQ_INSTANCE_T typedef with struct vchiq_instance
In reply to Jamal ShareefReplaces VCHIQ_INSTANCE_T typedef with struct vchiq_instance to match kernel code style. Issue found by checkpatch.
Additionally, as part of the process renames "struct vchiq_instance_struct" to "struct vchiq_instance".
--- .../interface/vchiq_arm/vchiq_arm.c | 46 +++++++++---------- .../interface/vchiq_arm/vchiq_arm.h | 10 ++-- .../interface/vchiq_arm/vchiq_core.c | 12 ++--- .../interface/vchiq_arm/vchiq_core.h | 16 +++---- .../interface/vchiq_arm/vchiq_debugfs.c | 14 +++--- .../interface/vchiq_arm/vchiq_debugfs.h | 4 +- .../interface/vchiq_arm/vchiq_if.h | 16 +++---- .../interface/vchiq_arm/vchiq_shim.c | 10 ++-- 8 files changed, 64 insertions(+), 64 deletions(-)
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c +23 -23
@@ -84,7 +84,7 @@ static void suspend_timer_callback(struct timer_list *t);struct user_service {struct vchiq_service *service;void *userdata; -VCHIQ_INSTANCE_T instance; +struct vchiq_instance *instance;char is_vchi;char dequeue_pending;char close_pending;
@@ -103,7 +103,7 @@ struct bulk_waiter_node {struct list_head list; }; -struct vchiq_instance_struct { +struct vchiq_instance {struct vchiq_state *state;struct vchiq_completion_data completions[MAX_COMPLETIONS ];int completion_insert;
@@ -177,11 +177,11 @@ vchiq_blocking_bulk_transfer(unsigned int handle, void *data, unsigned int size, enum vchiq_bulk_dir dir);#define VCHIQ_INIT_RETRIES 10 -enum vchiq_status vchiq_initialise (VCHIQ_INSTANCE_T *instance_out) +enum vchiq_status vchiq_initialise (struct vchiq_instance **instance_out) {enum vchiq_status status =VCHIQ_ERROR ;struct vchiq_state *state; -VCHIQ_INSTANCE_T instance =NULL ; +struct vchiq_instance *instance =NULL ;int i;vchiq_log_trace (vchiq_core_log_level,"%s called" , __func__);
@@ -230,7 +230,7 @@ enum vchiq_status vchiq_initialise(VCHIQ_INSTANCE_T *instance_out) }EXPORT_SYMBOL (vchiq_initialise); -enum vchiq_status vchiq_shutdown (VCHIQ_INSTANCE_T instance) +enum vchiq_status vchiq_shutdown (struct vchiq_instance *instance) {enum vchiq_status status;struct vchiq_state *state = instance->state;
@@ -267,12 +267,12 @@ enum vchiq_status vchiq_shutdown(VCHIQ_INSTANCE_T instance) }EXPORT_SYMBOL (vchiq_shutdown); -static int vchiq_is_connected (VCHIQ_INSTANCE_T instance) +static int vchiq_is_connected (struct vchiq_instance *instance) {return instance->connected; } -enum vchiq_status vchiq_connect (VCHIQ_INSTANCE_T instance) +enum vchiq_status vchiq_connect (struct vchiq_instance *instance) {enum vchiq_status status;struct vchiq_state *state = instance->state;
@@ -302,7 +302,7 @@ enum vchiq_status vchiq_connect(VCHIQ_INSTANCE_T instance)EXPORT_SYMBOL (vchiq_connect);enum vchiq_status vchiq_add_service ( -VCHIQ_INSTANCE_T instance, +struct vchiq_instance *instance,const struct vchiq_service_params *params,unsigned int *phandle) {
@@ -341,7 +341,7 @@ enum vchiq_status vchiq_add_service(EXPORT_SYMBOL (vchiq_add_service);enum vchiq_status vchiq_open_service ( -VCHIQ_INSTANCE_T instance, +struct vchiq_instance *instance,const struct vchiq_service_params *params,unsigned int *phandle) {
@@ -433,7 +433,7 @@ static enum vchiq_status vchiq_blocking_bulk_transfer(unsigned int handle, void *data, unsigned int size, enum vchiq_bulk_dir dir) { - VCHIQ_INSTANCE_T instance; + struct vchiq_instance *instance;struct vchiq_service *service;enum vchiq_status status;struct bulk_waiter_node *waiter =NULL ;
@@ -516,7 +516,7 @@ vchiq_blocking_bulk_transfer(unsigned int handle, void *data,***************************************************************************/ static enum vchiq_status -add_completion (VCHIQ_INSTANCE_T instance,enum vchiq_reason reason, +add_completion (struct vchiq_instance *instance,enum vchiq_reason reason,struct vchiq_header *header,struct user_service *user_service,void *bulk_userdata) {
@@ -593,7 +593,7 @@ service_callback(enum vchiq_reason reason, struct vchiq_header *header,*/ struct user_service *user_service;struct vchiq_service *service; -VCHIQ_INSTANCE_T instance; +struct vchiq_instance *instance;bool skip_completion = false;DEBUG_INITIALISE (g_state.local)
@@ -804,7 +804,7 @@ vchiq_ioc_queue_message(unsigned int handle,static long vchiq_ioctl (struct file *file,unsigned int cmd,unsigned long arg) { -VCHIQ_INSTANCE_T instance = file->private_data; +struct vchiq_instance *instance = file->private_data;enum vchiq_status status =VCHIQ_SUCCESS ;struct vchiq_service *service =NULL ;long ret =0 ;
@@ -1919,7 +1919,7 @@ vchiq_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg)static int vchiq_open (struct inode *inode,struct file *file) {struct vchiq_state *state =vchiq_get_state (); -VCHIQ_INSTANCE_T instance; +struct vchiq_instance *instance;vchiq_log_info (vchiq_arm_log_level,"vchiq_open" );
@@ -1951,7 +1951,7 @@ static int vchiq_open(struct inode *inode, struct file *file)static int vchiq_release (struct inode *inode,struct file *file) { -VCHIQ_INSTANCE_T instance = file->private_data; +struct vchiq_instance *instance = file->private_data;struct vchiq_state *state =vchiq_get_state ();struct vchiq_service *service;int ret =0 ;
@@ -2130,7 +2130,7 @@ vchiq_dump_platform_instances(void *dump_context)for (i =0 ; i < state->unused_service; i++) {struct vchiq_service *service = state->services[i]; -VCHIQ_INSTANCE_T instance; +struct vchiq_instance *instance;if (service && (service->base.callback == service_callback)) { instance = service->instance;
@@ -2141,7 +2141,7 @@ vchiq_dump_platform_instances(void *dump_context)for (i =0 ; i < state->unused_service; i++) {struct vchiq_service *service = state->services[i]; -VCHIQ_INSTANCE_T instance; +struct vchiq_instance *instance;if (service && (service->base.callback == service_callback)) { instance = service->instance;
@@ -2288,7 +2288,7 @@ vchiq_keepalive_thread_func(void *v)struct vchiq_arm_state *arm_state =vchiq_platform_get_arm_state (state);enum vchiq_status status; -VCHIQ_INSTANCE_T instance; +struct vchiq_instance *instance;unsigned int ka_handle;struct vchiq_service_params params = {
@@ -2911,13 +2911,13 @@ vchiq_release_service_internal(struct vchiq_service *service) }struct vchiq_debugfs_node * -vchiq_instance_get_debugfs_node (VCHIQ_INSTANCE_T instance) +vchiq_instance_get_debugfs_node (struct vchiq_instance *instance) {return &instance->debugfs_node; }int -vchiq_instance_get_use_count (VCHIQ_INSTANCE_T instance) +vchiq_instance_get_use_count (struct vchiq_instance *instance) {struct vchiq_service *service;int use_count =0 , i;
@@ -2932,19 +2932,19 @@ vchiq_instance_get_use_count(VCHIQ_INSTANCE_T instance) }int -vchiq_instance_get_pid (VCHIQ_INSTANCE_T instance) +vchiq_instance_get_pid (struct vchiq_instance *instance) {return instance->pid; }int -vchiq_instance_get_trace (VCHIQ_INSTANCE_T instance) +vchiq_instance_get_trace (struct vchiq_instance *instance) {return instance->trace; }void -vchiq_instance_set_trace (VCHIQ_INSTANCE_T instance,int trace) +vchiq_instance_set_trace (struct vchiq_instance *instance,int trace) {struct vchiq_service *service;int i;
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.h +5 -5
@@ -162,19 +162,19 @@ vchiq_release_internal(struct vchiq_state *state, struct vchiq_service *service);extern struct vchiq_debugfs_node * -vchiq_instance_get_debugfs_node (VCHIQ_INSTANCE_T instance); +vchiq_instance_get_debugfs_node (struct vchiq_instance *instance);extern int -vchiq_instance_get_use_count (VCHIQ_INSTANCE_T instance); +vchiq_instance_get_use_count (struct vchiq_instance *instance);extern int -vchiq_instance_get_pid (VCHIQ_INSTANCE_T instance); +vchiq_instance_get_pid (struct vchiq_instance *instance);extern int -vchiq_instance_get_trace (VCHIQ_INSTANCE_T instance); +vchiq_instance_get_trace (struct vchiq_instance *instance);extern void -vchiq_instance_set_trace (VCHIQ_INSTANCE_T instance,int trace); +vchiq_instance_set_trace (struct vchiq_instance *instance,int trace); extern void set_suspend_state(struct vchiq_arm_state *arm_state,
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c +6 -6
@@ -177,7 +177,7 @@ find_service_by_port(struct vchiq_state *state, int localport) }struct vchiq_service * -find_service_for_instance (VCHIQ_INSTANCE_T instance, +find_service_for_instance (struct vchiq_instance *instance,unsigned int handle) {struct vchiq_service *service;
@@ -201,7 +201,7 @@ find_service_for_instance(VCHIQ_INSTANCE_T instance, }struct vchiq_service * -find_closed_service_for_instance (VCHIQ_INSTANCE_T instance, +find_closed_service_for_instance (struct vchiq_instance *instance,unsigned int handle) {struct vchiq_service *service;
@@ -227,7 +227,7 @@ find_closed_service_for_instance(VCHIQ_INSTANCE_T instance, }struct vchiq_service * -next_service_by_instance (struct vchiq_state *state,VCHIQ_INSTANCE_T instance, +next_service_by_instance (struct vchiq_state *state,struct vchiq_instance *instance,int *pidx) {struct vchiq_service *service =NULL ;
@@ -2280,7 +2280,7 @@ vchiq_init_state(struct vchiq_state *state, struct vchiq_slot_zero *slot_zero)struct vchiq_service *vchiq_add_service_internal (struct vchiq_state *state,const struct vchiq_service_params *params, -int srvstate,VCHIQ_INSTANCE_T instance, +int srvstate,struct vchiq_instance *instance,vchiq_userdata_term userdata_term) {struct vchiq_service *service;
@@ -2775,7 +2775,7 @@ vchiq_free_service_internal(struct vchiq_service *service) }enum vchiq_status -vchiq_connect_internal (struct vchiq_state *state,VCHIQ_INSTANCE_T instance) +vchiq_connect_internal (struct vchiq_state *state,struct vchiq_instance *instance) {struct vchiq_service *service;int i;
@@ -2811,7 +2811,7 @@ vchiq_connect_internal(struct vchiq_state *state, VCHIQ_INSTANCE_T instance) }enum vchiq_status -vchiq_shutdown_internal (struct vchiq_state *state,VCHIQ_INSTANCE_T instance) +vchiq_shutdown_internal (struct vchiq_state *state,struct vchiq_instance *instance) {struct vchiq_service *service;int i;
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h +8 -8
@@ -268,7 +268,7 @@ struct vchiq_service {short peer_version;struct vchiq_state *state; -VCHIQ_INSTANCE_T instance; +struct vchiq_instance *instance;int service_use_count;
@@ -382,7 +382,7 @@ struct vchiq_state {/* Mutex protecting services */ struct mutex mutex; -VCHIQ_INSTANCE_T *instance; +struct vchiq_instance **instance;/* Processes incoming messages */ struct task_struct *slot_handler_thread;
@@ -495,12 +495,12 @@ extern enum vchiq_status vchiq_init_state(struct vchiq_state *state, struct vchiq_slot_zero *slot_zero);extern enum vchiq_status -vchiq_connect_internal (struct vchiq_state *state,VCHIQ_INSTANCE_T instance); +vchiq_connect_internal (struct vchiq_state *state,struct vchiq_instance *instance);extern struct vchiq_service *vchiq_add_service_internal (struct vchiq_state *state,const struct vchiq_service_params *params, -int srvstate,VCHIQ_INSTANCE_T instance, +int srvstate,struct vchiq_instance *instance,vchiq_userdata_term userdata_term); extern enum vchiq_status
@@ -516,7 +516,7 @@ extern void vchiq_free_service_internal(struct vchiq_service *service);extern enum vchiq_status -vchiq_shutdown_internal (struct vchiq_state *state,VCHIQ_INSTANCE_T instance); +vchiq_shutdown_internal (struct vchiq_state *state,struct vchiq_instance *instance);extern void remote_event_pollall (struct vchiq_state *state);
@@ -560,15 +560,15 @@ extern struct vchiq_service * find_service_by_port(struct vchiq_state *state, int localport);extern struct vchiq_service * -find_service_for_instance (VCHIQ_INSTANCE_T instance, +find_service_for_instance (struct vchiq_instance *instance,unsigned int handle);extern struct vchiq_service * -find_closed_service_for_instance (VCHIQ_INSTANCE_T instance, +find_closed_service_for_instance (struct vchiq_instance *instance,unsigned int handle);extern struct vchiq_service * -next_service_by_instance (struct vchiq_state *state,VCHIQ_INSTANCE_T instance, +next_service_by_instance (struct vchiq_state *state,struct vchiq_instance *instance,int *pidx); extern void
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_debugfs.c +7 -7
@@ -117,7 +117,7 @@ static const struct file_operations debugfs_log_fops = {static int debugfs_usecount_show (struct seq_file *f,void *offset) { -VCHIQ_INSTANCE_T instance = f->private; +struct vchiq_instance *instance = f->private;int use_count; use_count =vchiq_instance_get_use_count (instance);
@@ -129,7 +129,7 @@ DEFINE_SHOW_ATTRIBUTE(debugfs_usecount);static int debugfs_trace_show (struct seq_file *f,void *offset) { -VCHIQ_INSTANCE_T instance = f->private; +struct vchiq_instance *instance = f->private;int trace; trace =vchiq_instance_get_trace (instance);
@@ -148,7 +148,7 @@ static ssize_t debugfs_trace_write(struct file *file, size_t count, loff_t *ppos) { struct seq_file *f = (struct seq_file *)file->private_data; -VCHIQ_INSTANCE_T instance = f->private; +struct vchiq_instance *instance = f->private;char firstchar;if (copy_from_user (&firstchar, buffer,1 ))
@@ -184,7 +184,7 @@ static const struct file_operations debugfs_trace_fops = { };/* add an instance (process) to the debugfs entries */ -void vchiq_debugfs_add_instance (VCHIQ_INSTANCE_T instance) +void vchiq_debugfs_add_instance (struct vchiq_instance *instance) {char pidstr[16 ];struct dentry *top;
@@ -201,7 +201,7 @@ void vchiq_debugfs_add_instance(VCHIQ_INSTANCE_T instance)vchiq_instance_get_debugfs_node (instance)->dentry = top; } -void vchiq_debugfs_remove_instance (VCHIQ_INSTANCE_T instance) +void vchiq_debugfs_remove_instance (struct vchiq_instance *instance) {struct vchiq_debugfs_node *node =vchiq_instance_get_debugfs_node (instance);
@@ -242,11 +242,11 @@ void vchiq_debugfs_deinit(void) { } -void vchiq_debugfs_add_instance (VCHIQ_INSTANCE_T instance) +void vchiq_debugfs_add_instance (struct vchiq_instance *instance) { } -void vchiq_debugfs_remove_instance (VCHIQ_INSTANCE_T instance) +void vchiq_debugfs_remove_instance (struct vchiq_instance *instance) { }
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_debugfs.h +2 -2
@@ -14,8 +14,8 @@ void vchiq_debugfs_init(void);void vchiq_debugfs_deinit (void ); -void vchiq_debugfs_add_instance (VCHIQ_INSTANCE_T instance); +void vchiq_debugfs_add_instance (struct vchiq_instance *instance); -void vchiq_debugfs_remove_instance (VCHIQ_INSTANCE_T instance); +void vchiq_debugfs_remove_instance (struct vchiq_instance *instance);#endif /* VCHIQ_DEBUGFS_H */
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_if.h +8 -8
@@ -90,16 +90,16 @@ struct vchiq_config {short version_min;/* The minimum compatible version of VCHIQ */ }; -typedef struct vchiq_instance_struct *VCHIQ_INSTANCE_T ; +struct vchiq_instance ;typedef void (*vchiq_remote_callback )(void *cb_arg); -extern enum vchiq_status vchiq_initialise (VCHIQ_INSTANCE_T *pinstance); -extern enum vchiq_status vchiq_shutdown (VCHIQ_INSTANCE_T instance); -extern enum vchiq_status vchiq_connect (VCHIQ_INSTANCE_T instance); -extern enum vchiq_status vchiq_add_service (VCHIQ_INSTANCE_T instance, +extern enum vchiq_status vchiq_initialise (struct vchiq_instance **pinstance); +extern enum vchiq_status vchiq_shutdown (struct vchiq_instance *instance); +extern enum vchiq_status vchiq_connect (struct vchiq_instance *instance); +extern enum vchiq_status vchiq_add_service (struct vchiq_instance *instance,const struct vchiq_service_params *params,unsigned int *pservice); -extern enum vchiq_status vchiq_open_service (VCHIQ_INSTANCE_T instance, +extern enum vchiq_status vchiq_open_service (struct vchiq_instance *instance,const struct vchiq_service_params *params,unsigned int *pservice);extern enum vchiq_status vchiq_close_service (unsigned int service);
@@ -133,9 +133,9 @@ extern void vchiq_get_config(struct vchiq_config *config);extern enum vchiq_status vchiq_set_service_option (unsigned int service,enum vchiq_service_option option,int value); -extern enum vchiq_status vchiq_remote_use (VCHIQ_INSTANCE_T instance, +extern enum vchiq_status vchiq_remote_use (struct vchiq_instance *instance,vchiq_remote_callback callback,void *cb_arg); -extern enum vchiq_status vchiq_remote_release (VCHIQ_INSTANCE_T instance); +extern enum vchiq_status vchiq_remote_release (struct vchiq_instance *instance);extern enum vchiq_status vchiq_dump_phys_mem (unsigned int service,void *ptr,size_t num_bytes);
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_shim.c +5 -5
@@ -440,7 +440,7 @@ EXPORT_SYMBOL(vchi_msg_hold);int32_t vchi_initialise (struct vchi_instance_handle **instance_handle) { -VCHIQ_INSTANCE_T instance; +struct vchiq_instance *instance;enum vchiq_status status; status =vchiq_initialise (&instance);
@@ -464,7 +464,7 @@ EXPORT_SYMBOL(vchi_initialise);***********************************************************/ int32_t vchi_connect (struct vchi_instance_handle *instance_handle) { -VCHIQ_INSTANCE_T instance = (VCHIQ_INSTANCE_T )instance_handle; +struct vchiq_instance *instance = (struct vchiq_instance *)instance_handle;return vchiq_connect (instance); }
@@ -483,7 +483,7 @@ EXPORT_SYMBOL(vchi_connect);***********************************************************/ int32_t vchi_disconnect (struct vchi_instance_handle *instance_handle) { -VCHIQ_INSTANCE_T instance = (VCHIQ_INSTANCE_T )instance_handle; +struct vchiq_instance *instance = (struct vchiq_instance *)instance_handle;return vchiq_status_to_vchi (vchiq_shutdown (instance)); }
@@ -565,7 +565,7 @@ static enum vchiq_status shim_callback(enum vchiq_reason reason,return VCHIQ_SUCCESS ; } -static struct shim_service *service_alloc (VCHIQ_INSTANCE_T instance, +static struct shim_service *service_alloc (struct vchiq_instance *instance,struct service_creation *setup) {struct shim_service *service =kzalloc (sizeof (struct shim_service ),GFP_KERNEL );
@@ -597,7 +597,7 @@ int32_t vchi_service_open(struct vchi_instance_handle *instance_handle,struct service_creation *setup, struct vchi_service_handle **handle) { - VCHIQ_INSTANCE_T instance = (VCHIQ_INSTANCE_T)instance_handle; + struct vchiq_instance *instance = (struct vchiq_instance *)instance_handle;struct shim_service *service =service_alloc (instance, setup); *handle = (struct vchi_service_handle *)service;
Signature · 1 line
2.17.1
PATCH v2 14/14 staging: vc04_services: Replace VCHIQ_PLATFORM_STATE_T typedef with struct opaque_platform_state
In reply to Jamal ShareefReplace VCHIQ_PLATFORM_STATE_T typedef with struct opaque_platform_state to match kernel code style. Issue found by checkpatch.
--- .../staging/vc04_services/interface/vchiq_arm/vchiq_core.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h +2 -2
@@ -236,7 +236,7 @@ struct remote_event {u32 __unused; }; -typedef struct opaque_platform_state_t *VCHIQ_PLATFORM_STATE_T ; +struct opaque_platform_state ;struct vchiq_slot {char data[VCHIQ_SLOT_SIZE ];
@@ -468,7 +468,7 @@ struct vchiq_state {struct vchiq_service_quota service_quotas[VCHIQ_MAX_SERVICES ];struct vchiq_slot_info slot_info[VCHIQ_MAX_SLOTS ]; -VCHIQ_PLATFORM_STATE_T platform_state; +struct opaque_platform_state *platform_state; };struct bulk_waiter {
Signature · 1 line
2.17.1