From 71bf6337a8953375e665a0ba4f68304a36068e99 Mon Sep 17 00:00:00 2001 From: Nicolas Saenz Julienne Date: Fri, 31 Jan 2020 11:38:21 +0100 Subject: [PATCH] staging: vc04_services: Delete blocked_count in struct vchiq_arm_state The variable is always 0. So delete it an all the code conditional to it. Signed-off-by: Nicolas Saenz Julienne Link: https://lore.kernel.org/r/20200131103836.14312-6-nsaenzjulienne@suse.de Signed-off-by: Greg Kroah-Hartman --- drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c | 2 -- drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.h | 2 -- 2 files changed, 4 deletions(-) diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c index 9264bb5d0bbe2..4545df573c909 100644 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c @@ -2266,8 +2266,6 @@ vchiq_videocore_wanted(struct vchiq_state *state) if (!arm_state) /* autosuspend not supported - always return wanted */ return 1; - else if (arm_state->blocked_count) - 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); diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.h b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.h index 6bab241313b8b..35889a65b17f0 100644 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.h +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.h @@ -70,8 +70,6 @@ struct vchiq_arm_state { */ int peer_use_count; - int blocked_count; - /* Flag to indicate that the first vchiq connect has made it through. ** This means that both sides should be fully ready, and we should ** be able to suspend after this point. -- 2.39.5