staging: vc04_services: get rid of blocked_blocker completion in struct vchiq_arm_state

Nobody is waiting on it, so delete it.

Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
Link: https://lore.kernel.org/r/20200131103836.14312-5-nsaenzjulienne@suse.de
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

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 311df3d8549472d9006e915f8de1d5b9e6d648a0..9264bb5d0bbe255db9f1846ec106a8577115b5b1 100644 (file)
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
@@ -2386,11 +2386,6 @@ vchiq_arm_init_state(struct vchiq_state *state,
                 * completion while videocore is suspended. */
                set_resume_state(arm_state, VC_RESUME_RESUMED);
 
-               init_completion(&arm_state->blocked_blocker);
-               /* Initialise to 'done' state.  We only want to block on this
-                * completion while things are waiting on the resume blocker */
-               complete_all(&arm_state->blocked_blocker);
-
                arm_state->suspend_timer_timeout = SUSPEND_TIMER_TIMEOUT_MS;
                arm_state->suspend_timer_running = 0;
                arm_state->state = 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 7d13168753436d1d569439c17b85bea674bc7075..6bab241313b8b00270e8d4769f8da71f394b8331 100644 (file)
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.h
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.h
@@ -70,7 +70,6 @@ struct vchiq_arm_state {
        */
        int peer_use_count;
 
-       struct completion blocked_blocker;
        int blocked_count;
 
        /* Flag to indicate that the first vchiq connect has made it through.