staging: vc04_services: Delete vc_suspend_complete completion (26a65975) · Commits · 戴 / test

drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c

+0 −7

Original line number	Diff line number	Diff line
		@@ -2356,8 +2356,6 @@ vchiq_arm_init_state(struct vchiq_state *state,
		atomic_set(&arm_state->ka_use_ack_count, 0);
		atomic_set(&arm_state->ka_release_count, 0);

		init_completion(&arm_state->vc_suspend_complete);

		init_completion(&arm_state->vc_resume_complete);
		/* Initialise to 'done' state. We only want to block on resume
		* completion while videocore is suspended. */
		@@ -2436,18 +2434,14 @@ set_suspend_state(struct vchiq_arm_state *arm_state,
		/* state specific additional actions */
		switch (new_state) {
		case VC_SUSPEND_FORCE_CANCELED:
		complete_all(&arm_state->vc_suspend_complete);
		break;
		case VC_SUSPEND_REJECTED:
		complete_all(&arm_state->vc_suspend_complete);
		break;
		case VC_SUSPEND_FAILED:
		complete_all(&arm_state->vc_suspend_complete);
		arm_state->vc_resume_state = VC_RESUME_RESUMED;
		complete_all(&arm_state->vc_resume_complete);
		break;
		case VC_SUSPEND_IDLE:
		reinit_completion(&arm_state->vc_suspend_complete);
		break;
		case VC_SUSPEND_REQUESTED:
		break;
		@@ -2455,7 +2449,6 @@ set_suspend_state(struct vchiq_arm_state *arm_state,
		set_resume_state(arm_state, VC_RESUME_IDLE);
		break;
		case VC_SUSPEND_SUSPENDED:
		complete_all(&arm_state->vc_suspend_complete);
		break;
		default:
		BUG();

+0 −1

Original line number	Diff line number	Diff line
		@@ -46,7 +46,6 @@ struct vchiq_arm_state {
		atomic_t ka_use_ack_count;
		atomic_t ka_release_count;

		struct completion vc_suspend_complete;
		struct completion vc_resume_complete;

		rwlock_t susp_res_lock;