Commit 0b53ca31 authored by Dominic Braun's avatar Dominic Braun Committed by Greg Kroah-Hartman
Browse files

staging: vc04_services: Remove VCHIQ_SERVICE_PARAMS_T typedef 



Typedefing structs is not encouraged in the kernel.

Signed-off-by: default avatarDominic Braun <inf.braun@fau.de>
Signed-off-by: default avatarTobias Büttner <tobias.buettner@fau.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c18cbdee

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

+3 −3
Original line number Diff line number Diff line
@@ -331,7 +331,7 @@ EXPORT_SYMBOL(vchiq_connect); 


VCHIQ_STATUS_T vchiq_add_service(

	VCHIQ_INSTANCE_T              instance,

	const VCHIQ_SERVICE_PARAMS_T *params,

	const struct vchiq_service_params *params,

	VCHIQ_SERVICE_HANDLE_T       *phandle)

{

	VCHIQ_STATUS_T status;
@@ -370,7 +370,7 @@ EXPORT_SYMBOL(vchiq_add_service); 


VCHIQ_STATUS_T vchiq_open_service(

	VCHIQ_INSTANCE_T              instance,

	const VCHIQ_SERVICE_PARAMS_T *params,

	const struct vchiq_service_params *params,

	VCHIQ_SERVICE_HANDLE_T       *phandle)

{

	VCHIQ_STATUS_T   status = VCHIQ_ERROR;
@@ -2328,7 +2328,7 @@ vchiq_keepalive_thread_func(void *v) 
	VCHIQ_INSTANCE_T instance;

	VCHIQ_SERVICE_HANDLE_T ka_handle;



	VCHIQ_SERVICE_PARAMS_T params = {

	struct vchiq_service_params params = {

		.fourcc      = VCHIQ_MAKE_FOURCC('K', 'E', 'E', 'P'),

		.callback    = vchiq_keepalive_vchiq_callback,

		.version     = KEEPALIVE_VER,

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

+1 −1
Original line number Diff line number Diff line
@@ -2303,7 +2303,7 @@ vchiq_init_state(VCHIQ_STATE_T *state, VCHIQ_SLOT_ZERO_T *slot_zero) 
/* Called from application thread when a client or server service is created. */

VCHIQ_SERVICE_T *

vchiq_add_service_internal(VCHIQ_STATE_T *state,

	const VCHIQ_SERVICE_PARAMS_T *params, int srvstate,

	const struct vchiq_service_params *params, int srvstate,

	VCHIQ_INSTANCE_T instance, VCHIQ_USERDATA_TERM_T userdata_term)

{

	VCHIQ_SERVICE_T *service;

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

+1 −1
Original line number Diff line number Diff line
@@ -531,7 +531,7 @@ vchiq_connect_internal(VCHIQ_STATE_T *state, VCHIQ_INSTANCE_T instance); 


extern VCHIQ_SERVICE_T *

vchiq_add_service_internal(VCHIQ_STATE_T *state,

	const VCHIQ_SERVICE_PARAMS_T *params, int srvstate,

	const struct vchiq_service_params *params, int srvstate,

	VCHIQ_INSTANCE_T instance, VCHIQ_USERDATA_TERM_T userdata_term);



extern VCHIQ_STATUS_T

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

+4 −4
Original line number Diff line number Diff line
@@ -103,13 +103,13 @@ struct vchiq_service_base { 
	void *userdata;

};



typedef struct vchiq_service_params_struct {

struct vchiq_service_params {

	int fourcc;

	VCHIQ_CALLBACK_T callback;

	void *userdata;

	short version;       /* Increment for non-trivial changes */

	short version_min;   /* Update for incompatible changes */

} VCHIQ_SERVICE_PARAMS_T;

};



struct vchiq_config {

	unsigned int max_msg_size;
@@ -129,10 +129,10 @@ extern VCHIQ_STATUS_T vchiq_initialise(VCHIQ_INSTANCE_T *pinstance); 
extern VCHIQ_STATUS_T vchiq_shutdown(VCHIQ_INSTANCE_T instance);

extern VCHIQ_STATUS_T vchiq_connect(VCHIQ_INSTANCE_T instance);

extern VCHIQ_STATUS_T vchiq_add_service(VCHIQ_INSTANCE_T instance,

	const VCHIQ_SERVICE_PARAMS_T *params,

	const struct vchiq_service_params *params,

	VCHIQ_SERVICE_HANDLE_T *pservice);

extern VCHIQ_STATUS_T vchiq_open_service(VCHIQ_INSTANCE_T instance,

	const VCHIQ_SERVICE_PARAMS_T *params,

	const struct vchiq_service_params *params,

	VCHIQ_SERVICE_HANDLE_T *pservice);

extern VCHIQ_STATUS_T vchiq_close_service(VCHIQ_SERVICE_HANDLE_T service);

extern VCHIQ_STATUS_T vchiq_remove_service(VCHIQ_SERVICE_HANDLE_T service);

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

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ 
#define VCHIQ_INVALID_HANDLE (~0)



struct vchiq_create_service {

	VCHIQ_SERVICE_PARAMS_T params;

	struct vchiq_service_params params;

	int is_open;

	int is_vchi;

	unsigned int handle;       /* OUT */