[PATCH 05/22] staging: vc04_services: Delete blocked_count in struct vchiq_arm_state
From: Nicolas Saenz Julienne
Date: Fri Jan 24 2020 - 09:47:58 EST
The variable is always 0. So delete it an all the code conditional to
it.
Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne@xxxxxxx>
---
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 9264bb5d0bbe..4545df573c90 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 6bab241313b8..35889a65b17f 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.25.0