| Message ID | 20200131103836.14312-5-nsaenzjulienne@suse.de (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 9af64167354fc62eb253c802029313e7f29291d3 |
| Headers | show |
| Series | staging: vc04_services: suspend/resume cleanup | expand |
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 311df3d85494..9264bb5d0bbe 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->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 7d1316875343..6bab241313b8 100644 --- 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.
Nobody is waiting on it, so delete it. Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de> --- .../staging/vc04_services/interface/vchiq_arm/vchiq_arm.c | 5 ----- .../staging/vc04_services/interface/vchiq_arm/vchiq_arm.h | 1 - 2 files changed, 6 deletions(-)