diff options
| author | Nicolas Saenz Julienne <nsaenzjulienne@suse.de> | 2020-01-31 11:38:19 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-02-09 16:22:58 -0800 |
| commit | d91f500a12739cfbece9820a0e243ed9cecac8cc (patch) | |
| tree | 849334aee32caa5e6e613ad96a76c1e3d12eeb50 /drivers | |
| parent | 7d153fcc10702fbc5e96c8bb83832c166cd813d4 (diff) | |
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c | 11 | ||||
| -rw-r--r-- | drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.h | 4 |
2 files changed, 0 insertions, 15 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 af4dc23f5510..311df3d85494 100644 --- 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 c904f7be9084..7d1316875343 100644 --- 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; |