Commit e4c1935e authored by Ojaswin Mujoo's avatar Ojaswin Mujoo Committed by Greg Kroah-Hartman
Browse files

staging: vchiq: Replace function typedefs with equivalent declaration 



Replace function typedefs with the equivalent declarations to better
align with the linux kenel coding style

The following typedefs were changed:
*  VCHIQ_CONNECTED_CALLBACK_T
*  vchiq_userdata_term

Signed-off-by: default avatarOjaswin Mujoo <ojaswin98@gmail.com>
Link: https://lore.kernel.org/r/a8e4e0457b5fcc88c7f297f9d669dfb7e7d91ed5.1631366317.git.ojaswin98@gmail.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0af8efc1

drivers/staging/vc04_services/interface/vchiq_arm/vchiq_connected.c

+2 −2
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 


static   int                        g_connected;

static   int                        g_num_deferred_callbacks;

static   VCHIQ_CONNECTED_CALLBACK_T g_deferred_callback[MAX_CALLBACKS];

static   void (*g_deferred_callback[MAX_CALLBACKS])(void);

static   int                        g_once_init;

static   DEFINE_MUTEX(g_connected_mutex);
@@ -28,7 +28,7 @@ static void connected_init(void) 
 * be made immediately, otherwise it will be deferred until

 * vchiq_call_connected_callbacks is called.

 */

void vchiq_add_connected_callback(VCHIQ_CONNECTED_CALLBACK_T callback)

void vchiq_add_connected_callback(void (*callback)(void))

{

	connected_init();

drivers/staging/vc04_services/interface/vchiq_arm/vchiq_connected.h

+1 −3
Original line number Diff line number Diff line
@@ -4,9 +4,7 @@ 
#ifndef VCHIQ_CONNECTED_H

#define VCHIQ_CONNECTED_H



typedef void (*VCHIQ_CONNECTED_CALLBACK_T)(void);



void vchiq_add_connected_callback(VCHIQ_CONNECTED_CALLBACK_T callback);

void vchiq_add_connected_callback(void (*callback)(void));

void vchiq_call_connected_callbacks(void);



#endif /* VCHIQ_CONNECTED_H */

drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c

+1 −1
Original line number Diff line number Diff line
@@ -2474,7 +2474,7 @@ struct vchiq_service * 
vchiq_add_service_internal(struct vchiq_state *state,

			   const struct vchiq_service_params_kernel *params,

			   int srvstate, struct vchiq_instance *instance,

			   vchiq_userdata_term userdata_term)

			   void (*userdata_term)(void *userdata))

{

	struct vchiq_service *service;

	struct vchiq_service __rcu **pservice = NULL;

drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h

+2 −4
Original line number Diff line number Diff line
@@ -152,8 +152,6 @@ enum vchiq_bulk_dir { 
	VCHIQ_BULK_RECEIVE

};



typedef void (*vchiq_userdata_term)(void *userdata);



struct vchiq_bulk {

	short mode;

	short dir;
@@ -198,7 +196,7 @@ struct vchiq_service { 
	struct kref ref_count;

	struct rcu_head rcu;

	int srvstate;

	vchiq_userdata_term userdata_term;

	void (*userdata_term)(void *userdata);

	unsigned int localport;

	unsigned int remoteport;

	int public_fourcc;
@@ -476,7 +474,7 @@ struct vchiq_service * 
vchiq_add_service_internal(struct vchiq_state *state,

			   const struct vchiq_service_params_kernel *params,

			   int srvstate, struct vchiq_instance *instance,

			   vchiq_userdata_term userdata_term);

			   void (*userdata_term)(void *userdata));



extern enum vchiq_status

vchiq_open_service_internal(struct vchiq_service *service, int client_id);