staging: vc04_services: Get rid of resume_blocker completion in struct vchiq_arm_state

Nobody is waiting on it, so delete all relevant code.

Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
Link: https://lore.kernel.org/r/20200131103836.14312-4-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 af4dc23f551045c33cce8db2ba1d3b35c1620fe6..311df3d8549472d9006e915f8de1d5b9e6d648a0 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->resume_blocker);
-               /* Initialise to 'done' state.  We only want to block on this
-                * completion while resume is blocked */
-               complete_all(&arm_state->resume_blocker);
-
                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 */
@@ -2560,12 +2555,6 @@ need_resume(struct vchiq_state *state)
                        vchiq_videocore_wanted(state);
 }
 
-static inline void
-unblock_resume(struct vchiq_arm_state *arm_state)
-{
-       complete_all(&arm_state->resume_blocker);
-}
-
 /* Initiate suspend via slot handler. Should be called with the write lock
  * held */
 enum vchiq_status

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 c904f7be90840976efd8cfa08bba332a0c2eed4f..7d13168753436d1d569439c17b85bea674bc7075 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,10 +70,6 @@ struct vchiq_arm_state {
        */
        int peer_use_count;
 
-       /* Flag to indicate whether resume is blocked.  This happens when the
-       ** ARM is suspending
-       */
-       struct completion resume_blocker;
        struct completion blocked_blocker;
        int blocked_count;