diff options
| author | Nicolas Saenz Julienne <nsaenzjulienne@suse.de> | 2020-01-31 11:38:21 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-02-09 16:22:59 -0800 |
| commit | dcbcbfa4af0964202d38f23f21072e617448acaa (patch) | |
| tree | 0ce71e061b0e6df8d5ba2de3d428b35858d34bbb /drivers/staging | |
| parent | 9af64167354fc62eb253c802029313e7f29291d3 (diff) | |
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 <nsaenzjulienne@suse.de>
Link: https://lore.kernel.org/r/20200131103836.14312-6-nsaenzjulienne@suse.de
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c | 2 | ||||
| -rw-r--r-- | drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.h | 2 |
2 files changed, 0 insertions, 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. |