Commit 631c5a53 authored by Stefan Wahren's avatar Stefan Wahren Committed by Greg Kroah-Hartman
Browse files

staging: vchiq_arm: re-order vchiq_arm_init_state 



This moves vchiq_arm_init_state() above its caller, so we can drop the
now unnecessary forward declaration and make the function static.

Signed-off-by: default avatarStefan Wahren <stefan.wahren@i2se.com>
Link: https://lore.kernel.org/r/1633264369-998-2-git-send-email-stefan.wahren@i2se.com


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

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

+17 −17
Original line number Diff line number Diff line
@@ -509,6 +509,23 @@ int vchiq_platform_init(struct platform_device *pdev, struct vchiq_state *state) 
	return 0;

}



static void

vchiq_arm_init_state(struct vchiq_state *state,

		     struct vchiq_arm_state *arm_state)

{

	if (arm_state) {

		rwlock_init(&arm_state->susp_res_lock);



		init_completion(&arm_state->ka_evt);

		atomic_set(&arm_state->ka_use_count, 0);

		atomic_set(&arm_state->ka_use_ack_count, 0);

		atomic_set(&arm_state->ka_release_count, 0);



		arm_state->state = state;

		arm_state->first_connect = 0;

	}

}



int

vchiq_platform_init_state(struct vchiq_state *state)

{
@@ -1324,23 +1341,6 @@ vchiq_keepalive_thread_func(void *v) 
	return 0;

}



void

vchiq_arm_init_state(struct vchiq_state *state,

		     struct vchiq_arm_state *arm_state)

{

	if (arm_state) {

		rwlock_init(&arm_state->susp_res_lock);



		init_completion(&arm_state->ka_evt);

		atomic_set(&arm_state->ka_use_count, 0);

		atomic_set(&arm_state->ka_use_ack_count, 0);

		atomic_set(&arm_state->ka_release_count, 0);



		arm_state->state = state;

		arm_state->first_connect = 0;

	}

}



int

vchiq_use_internal(struct vchiq_state *state, struct vchiq_service *service,

		   enum USE_TYPE_E use_type)

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

+0 −4
Original line number Diff line number Diff line
@@ -127,10 +127,6 @@ int vchiq_platform_init(struct platform_device *pdev, 
extern struct vchiq_state *

vchiq_get_state(void);



extern void

vchiq_arm_init_state(struct vchiq_state *state,

		     struct vchiq_arm_state *arm_state);



extern void

vchiq_check_suspend(struct vchiq_state *state);

enum vchiq_status