Commit 004e890d authored by Nicolas Saenz Julienne's avatar Nicolas Saenz Julienne Committed by Greg Kroah-Hartman
Browse files

staging: vc04_services: Get rid of vchiq_platform_videocore_wanted() 



The function always returns true, which makes a whole bunch of code
useless.

Signed-off-by: default avatarNicolas Saenz Julienne <nsaenzjulienne@suse.de>
Link: https://lore.kernel.org/r/20200131103836.14312-10-nsaenzjulienne@suse.de


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

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

+0 −5
Original line number Diff line number Diff line
@@ -257,11 +257,6 @@ int vchiq_dump_platform_state(void *dump_context) 
	return vchiq_dump(dump_context, buf, len + 1);

}



int

vchiq_platform_videocore_wanted(struct vchiq_state *state)

{

	return 1; // autosuspend not supported - videocore always wanted

}

void

vchiq_platform_handle_timeout(struct vchiq_state *state)

{

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

+5 −29
Original line number Diff line number Diff line
@@ -2253,22 +2253,6 @@ vchiq_fops = { 
 * Autosuspend related functionality

 */



int

vchiq_videocore_wanted(struct vchiq_state *state)

{

	struct vchiq_arm_state *arm_state = vchiq_platform_get_arm_state(state);



	if (!arm_state)

		/* autosuspend not supported - always return wanted */

		return 1;

	else if (!arm_state->videocore_use_count)

		/* usage count zero - check for override unless we're forcing */

		return vchiq_platform_videocore_wanted(state);

	else

		/* non-zero usage count - videocore still required */

		return 1;

}



static enum vchiq_status

vchiq_keepalive_vchiq_callback(enum vchiq_reason reason,

	struct vchiq_header *header,
@@ -2513,8 +2497,7 @@ need_resume(struct vchiq_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) &&

			vchiq_videocore_wanted(state);

			(arm_state->vc_resume_state < VC_RESUME_REQUESTED);

}



/* Initiate suspend via slot handler. Should be called with the write lock
@@ -2736,13 +2719,6 @@ vchiq_release_internal(struct vchiq_state *state, struct vchiq_service *service) 
	--arm_state->videocore_use_count;

	--(*entity_uc);



	if (!vchiq_videocore_wanted(state)) {

		vchiq_log_info(vchiq_susp_log_level,

			"%s %s count %d, state count %d - suspending",

			__func__, entity, *entity_uc,

			arm_state->videocore_use_count);

		vchiq_arm_vcsuspend(state);

	} else

	vchiq_log_trace(vchiq_susp_log_level,

		"%s %s count %d, state count %d",

		__func__, entity, *entity_uc,

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

+0 −5
Original line number Diff line number Diff line
@@ -112,9 +112,6 @@ vchiq_release_service(unsigned int handle); 
extern enum vchiq_status

vchiq_check_service(struct vchiq_service *service);



extern int

vchiq_platform_videocore_wanted(struct vchiq_state *state);



extern void

vchiq_dump_platform_use_state(struct vchiq_state *state);
@@ -124,8 +121,6 @@ vchiq_dump_service_use_state(struct vchiq_state *state); 
extern struct vchiq_arm_state*

vchiq_platform_get_arm_state(struct vchiq_state *state);



extern int

vchiq_videocore_wanted(struct vchiq_state *state);



extern enum vchiq_status

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

CRA Git | Maintained and supported by SUSTech CRA and CCSE