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

staging: vc04_services: Remove VCHIQ_ARM_STATE_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 2be0bef0

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

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


struct vchiq_2835_state {

	int inited;

	VCHIQ_ARM_STATE_T arm_state;

	struct vchiq_arm_state arm_state;

};



struct vchiq_pagelist_info {
@@ -220,7 +220,7 @@ vchiq_platform_init_state(VCHIQ_STATE_T *state) 
	return status;

}



VCHIQ_ARM_STATE_T*

struct vchiq_arm_state*

vchiq_platform_get_arm_state(VCHIQ_STATE_T *state)

{

	struct vchiq_2835_state *platform_state;

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

+28 −27
Original line number Diff line number Diff line
@@ -2288,7 +2288,7 @@ vchiq_fops = { 
int

vchiq_videocore_wanted(VCHIQ_STATE_T *state)

{

	VCHIQ_ARM_STATE_T *arm_state = vchiq_platform_get_arm_state(state);

	struct vchiq_arm_state *arm_state = vchiq_platform_get_arm_state(state);



	if (!arm_state)

		/* autosuspend not supported - always return wanted */
@@ -2321,7 +2321,7 @@ static int 
vchiq_keepalive_thread_func(void *v)

{

	VCHIQ_STATE_T *state = (VCHIQ_STATE_T *) v;

	VCHIQ_ARM_STATE_T *arm_state = vchiq_platform_get_arm_state(state);

	struct vchiq_arm_state *arm_state = vchiq_platform_get_arm_state(state);



	VCHIQ_STATUS_T status;

	VCHIQ_INSTANCE_T instance;
@@ -2399,7 +2399,7 @@ vchiq_keepalive_thread_func(void *v) 
}



VCHIQ_STATUS_T

vchiq_arm_init_state(VCHIQ_STATE_T *state, VCHIQ_ARM_STATE_T *arm_state)

vchiq_arm_init_state(VCHIQ_STATE_T *state, struct vchiq_arm_state *arm_state)

{

	if (arm_state) {

		rwlock_init(&arm_state->susp_res_lock);
@@ -2495,7 +2495,7 @@ vchiq_arm_init_state(VCHIQ_STATE_T *state, VCHIQ_ARM_STATE_T *arm_state) 
*/



void

set_suspend_state(VCHIQ_ARM_STATE_T *arm_state,

set_suspend_state(struct vchiq_arm_state *arm_state,

		  enum vc_suspend_status new_state)

{

	/* set the state in all cases */
@@ -2532,7 +2532,7 @@ set_suspend_state(VCHIQ_ARM_STATE_T *arm_state, 
}



void

set_resume_state(VCHIQ_ARM_STATE_T *arm_state,

set_resume_state(struct vchiq_arm_state *arm_state,

		 enum vc_resume_status new_state)

{

	/* set the state in all cases */
@@ -2561,7 +2561,7 @@ set_resume_state(VCHIQ_ARM_STATE_T *arm_state, 


/* should be called with the write lock held */

inline void

start_suspend_timer(VCHIQ_ARM_STATE_T *arm_state)

start_suspend_timer(struct vchiq_arm_state *arm_state)

{

	del_timer(&arm_state->suspend_timer);

	arm_state->suspend_timer.expires = jiffies +
@@ -2572,7 +2572,7 @@ start_suspend_timer(VCHIQ_ARM_STATE_T *arm_state) 


/* should be called with the write lock held */

static inline void

stop_suspend_timer(VCHIQ_ARM_STATE_T *arm_state)

stop_suspend_timer(struct vchiq_arm_state *arm_state)

{

	if (arm_state->suspend_timer_running) {

		del_timer(&arm_state->suspend_timer);
@@ -2583,7 +2583,7 @@ stop_suspend_timer(VCHIQ_ARM_STATE_T *arm_state) 
static inline int

need_resume(VCHIQ_STATE_T *state)

{

	VCHIQ_ARM_STATE_T *arm_state = vchiq_platform_get_arm_state(state);

	struct vchiq_arm_state *arm_state = vchiq_platform_get_arm_state(state);



	return (arm_state->vc_suspend_state > VC_SUSPEND_IDLE) &&

			(arm_state->vc_resume_state < VC_RESUME_REQUESTED) &&
@@ -2591,7 +2591,7 @@ need_resume(VCHIQ_STATE_T *state) 
}



static int

block_resume(VCHIQ_ARM_STATE_T *arm_state)

block_resume(struct vchiq_arm_state *arm_state)

{

	int status = VCHIQ_SUCCESS;

	const unsigned long timeout_val =
@@ -2657,7 +2657,7 @@ block_resume(VCHIQ_ARM_STATE_T *arm_state) 
}



static inline void

unblock_resume(VCHIQ_ARM_STATE_T *arm_state)

unblock_resume(struct vchiq_arm_state *arm_state)

{

	complete_all(&arm_state->resume_blocker);

	arm_state->resume_blocked = 0;
@@ -2669,7 +2669,7 @@ VCHIQ_STATUS_T 
vchiq_arm_vcsuspend(VCHIQ_STATE_T *state)

{

	VCHIQ_STATUS_T status = VCHIQ_ERROR;

	VCHIQ_ARM_STATE_T *arm_state = vchiq_platform_get_arm_state(state);

	struct vchiq_arm_state *arm_state = vchiq_platform_get_arm_state(state);



	if (!arm_state)

		goto out;
@@ -2717,7 +2717,7 @@ vchiq_arm_vcsuspend(VCHIQ_STATE_T *state) 
void

vchiq_platform_check_suspend(VCHIQ_STATE_T *state)

{

	VCHIQ_ARM_STATE_T *arm_state = vchiq_platform_get_arm_state(state);

	struct vchiq_arm_state *arm_state = vchiq_platform_get_arm_state(state);

	int susp = 0;



	if (!arm_state)
@@ -2744,7 +2744,7 @@ vchiq_platform_check_suspend(VCHIQ_STATE_T *state) 
static void

output_timeout_error(VCHIQ_STATE_T *state)

{

	VCHIQ_ARM_STATE_T *arm_state = vchiq_platform_get_arm_state(state);

	struct vchiq_arm_state *arm_state = vchiq_platform_get_arm_state(state);

	char err[50] = "";

	int vc_use_count = arm_state->videocore_use_count;

	int active_services = state->unused_service;
@@ -2789,7 +2789,7 @@ output_timeout_error(VCHIQ_STATE_T *state) 
VCHIQ_STATUS_T

vchiq_arm_force_suspend(VCHIQ_STATE_T *state)

{

	VCHIQ_ARM_STATE_T *arm_state = vchiq_platform_get_arm_state(state);

	struct vchiq_arm_state *arm_state = vchiq_platform_get_arm_state(state);

	VCHIQ_STATUS_T status = VCHIQ_ERROR;

	long rc = 0;

	int repeat = -1;
@@ -2900,7 +2900,7 @@ vchiq_arm_force_suspend(VCHIQ_STATE_T *state) 
void

vchiq_check_suspend(VCHIQ_STATE_T *state)

{

	VCHIQ_ARM_STATE_T *arm_state = vchiq_platform_get_arm_state(state);

	struct vchiq_arm_state *arm_state = vchiq_platform_get_arm_state(state);



	if (!arm_state)

		goto out;
@@ -2922,7 +2922,7 @@ vchiq_check_suspend(VCHIQ_STATE_T *state) 
int

vchiq_arm_allow_resume(VCHIQ_STATE_T *state)

{

	VCHIQ_ARM_STATE_T *arm_state = vchiq_platform_get_arm_state(state);

	struct vchiq_arm_state *arm_state = vchiq_platform_get_arm_state(state);

	int resume = 0;

	int ret = -1;
@@ -2966,7 +2966,7 @@ vchiq_arm_allow_resume(VCHIQ_STATE_T *state) 
int

vchiq_check_resume(VCHIQ_STATE_T *state)

{

	VCHIQ_ARM_STATE_T *arm_state = vchiq_platform_get_arm_state(state);

	struct vchiq_arm_state *arm_state = vchiq_platform_get_arm_state(state);

	int resume = 0;



	if (!arm_state)
@@ -2989,7 +2989,7 @@ VCHIQ_STATUS_T 
vchiq_use_internal(VCHIQ_STATE_T *state, VCHIQ_SERVICE_T *service,

		enum USE_TYPE_E use_type)

{

	VCHIQ_ARM_STATE_T *arm_state = vchiq_platform_get_arm_state(state);

	struct vchiq_arm_state *arm_state = vchiq_platform_get_arm_state(state);

	VCHIQ_STATUS_T ret = VCHIQ_SUCCESS;

	char entity[16];

	int *entity_uc;
@@ -3121,7 +3121,7 @@ vchiq_use_internal(VCHIQ_STATE_T *state, VCHIQ_SERVICE_T *service, 
VCHIQ_STATUS_T

vchiq_release_internal(VCHIQ_STATE_T *state, VCHIQ_SERVICE_T *service)

{

	VCHIQ_ARM_STATE_T *arm_state = vchiq_platform_get_arm_state(state);

	struct vchiq_arm_state *arm_state = vchiq_platform_get_arm_state(state);

	VCHIQ_STATUS_T ret = VCHIQ_SUCCESS;

	char entity[16];

	int *entity_uc;
@@ -3183,7 +3183,7 @@ vchiq_release_internal(VCHIQ_STATE_T *state, VCHIQ_SERVICE_T *service) 
void

vchiq_on_remote_use(VCHIQ_STATE_T *state)

{

	VCHIQ_ARM_STATE_T *arm_state = vchiq_platform_get_arm_state(state);

	struct vchiq_arm_state *arm_state = vchiq_platform_get_arm_state(state);



	vchiq_log_trace(vchiq_susp_log_level, "%s", __func__);

	atomic_inc(&arm_state->ka_use_count);
@@ -3193,7 +3193,7 @@ vchiq_on_remote_use(VCHIQ_STATE_T *state) 
void

vchiq_on_remote_release(VCHIQ_STATE_T *state)

{

	VCHIQ_ARM_STATE_T *arm_state = vchiq_platform_get_arm_state(state);

	struct vchiq_arm_state *arm_state = vchiq_platform_get_arm_state(state);



	vchiq_log_trace(vchiq_susp_log_level, "%s", __func__);

	atomic_inc(&arm_state->ka_release_count);
@@ -3262,7 +3262,8 @@ vchiq_instance_set_trace(VCHIQ_INSTANCE_T instance, int trace) 


static void suspend_timer_callback(struct timer_list *t)

{

	VCHIQ_ARM_STATE_T *arm_state = from_timer(arm_state, t, suspend_timer);

	struct vchiq_arm_state *arm_state =

					from_timer(arm_state, t, suspend_timer);

	VCHIQ_STATE_T *state = arm_state->state;



	vchiq_log_info(vchiq_susp_log_level,
@@ -3320,7 +3321,7 @@ struct service_data_struct { 
void

vchiq_dump_service_use_state(VCHIQ_STATE_T *state)

{

	VCHIQ_ARM_STATE_T *arm_state = vchiq_platform_get_arm_state(state);

	struct vchiq_arm_state *arm_state = vchiq_platform_get_arm_state(state);

	struct service_data_struct *service_data;

	int i, found = 0;

	/* If there's more than 64 services, only dump ones with
@@ -3406,7 +3407,7 @@ vchiq_dump_service_use_state(VCHIQ_STATE_T *state) 
VCHIQ_STATUS_T

vchiq_check_service(VCHIQ_SERVICE_T *service)

{

	VCHIQ_ARM_STATE_T *arm_state;

	struct vchiq_arm_state *arm_state;

	VCHIQ_STATUS_T ret = VCHIQ_ERROR;



	if (!service || !service->state)
@@ -3445,7 +3446,7 @@ void vchiq_on_remote_use_active(VCHIQ_STATE_T *state) 
void vchiq_platform_conn_state_changed(VCHIQ_STATE_T *state,

	VCHIQ_CONNSTATE_T oldstate, VCHIQ_CONNSTATE_T newstate)

{

	VCHIQ_ARM_STATE_T *arm_state = vchiq_platform_get_arm_state(state);

	struct vchiq_arm_state *arm_state = vchiq_platform_get_arm_state(state);



	vchiq_log_info(vchiq_susp_log_level, "%d: %s->%s", state->id,

		get_conn_state_name(oldstate), get_conn_state_name(newstate));

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

+9 −9
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ enum USE_TYPE_E { 
	USE_TYPE_VCHIQ

};



typedef struct vchiq_arm_state_struct {

struct vchiq_arm_state {

	/* Keepalive-related data */

	struct task_struct *ka_thread;

	struct completion ka_evt;
@@ -121,7 +121,7 @@ typedef struct vchiq_arm_state_struct { 
	unsigned long long resume_start_time;

	unsigned long long last_wake_time;



} VCHIQ_ARM_STATE_T;

};



struct vchiq_drvdata {

	const unsigned int cache_line_size;
@@ -149,7 +149,7 @@ extern VCHIQ_STATUS_T 
vchiq_arm_vcresume(VCHIQ_STATE_T *state);



extern VCHIQ_STATUS_T

vchiq_arm_init_state(VCHIQ_STATE_T *state, VCHIQ_ARM_STATE_T *arm_state);

vchiq_arm_init_state(VCHIQ_STATE_T *state, struct vchiq_arm_state *arm_state);



extern int

vchiq_check_resume(VCHIQ_STATE_T *state);
@@ -180,7 +180,7 @@ vchiq_dump_platform_use_state(VCHIQ_STATE_T *state); 
extern void

vchiq_dump_service_use_state(VCHIQ_STATE_T *state);



extern VCHIQ_ARM_STATE_T*

extern struct vchiq_arm_state*

vchiq_platform_get_arm_state(VCHIQ_STATE_T *state);



extern int
@@ -208,14 +208,14 @@ extern void 
vchiq_instance_set_trace(VCHIQ_INSTANCE_T instance, int trace);



extern void

set_suspend_state(VCHIQ_ARM_STATE_T *arm_state,

set_suspend_state(struct vchiq_arm_state *arm_state,

		  enum vc_suspend_status new_state);



extern void

set_resume_state(VCHIQ_ARM_STATE_T *arm_state,

set_resume_state(struct vchiq_arm_state *arm_state,

		 enum vc_resume_status new_state);



extern void

start_suspend_timer(VCHIQ_ARM_STATE_T *arm_state);

start_suspend_timer(struct vchiq_arm_state *arm_state);



#endif /* VCHIQ_ARM_H */