Commit d91f500a authored by Nicolas Saenz Julienne's avatar Nicolas Saenz Julienne Committed by Greg Kroah-Hartman
Browse files

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

parent 7d153fcc
Loading
Loading
Loading
Loading
+0 −11
Original line number Diff line number Diff line
@@ -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
+0 −4
Original line number Diff line number Diff line
@@ -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;