Merge pull request #314 from RanderWang/waiti-1.2

pipe: remove waiti when task is cancelled

Author: lgirdwood

src/audio/pipeline.c

@@ -1134,7 +1134,7 @@ void pipeline_schedule_cancel(struct pipeline *p)
 	int err;
 
 	/* cancel and wait for pipeline to complete */
-	err = schedule_task_cancel(&p->pipe_task, 1);
+	err = schedule_task_cancel(&p->pipe_task);
 	if (err < 0)
 		trace_pipe_error("pC0");
 }

src/include/sof/schedule.h

@@ -84,7 +84,7 @@ void schedule_task(struct task *task, uint64_t start, uint64_t deadline);
 
 void schedule_task_idle(struct task *task, uint64_t deadline);
 
-int schedule_task_cancel(struct task *task, int wait);
+int schedule_task_cancel(struct task *task);
 
 void schedule_task_complete(struct task *task);
 

src/lib/schedule.c

@@ -216,7 +216,7 @@ static struct task *schedule_edf(void)
 }
 
 /* cancel and delete task from scheduler - won't stop it if already running */
-int schedule_task_cancel(struct task *task, int wait)
+int schedule_task_cancel(struct task *task)
 {
 	uint32_t flags;
 	int ret = 0;
@@ -225,31 +225,17 @@ int schedule_task_cancel(struct task *task, int wait)
 
 	spin_lock_irq(&sch->lock, flags);
 
-	/* check current task state */
-	switch (task->state) {
-	case TASK_STATE_QUEUED:
+	/* check current task state, delete it if it is queued
+	 * if it is already running, nothing we can do about it atm
+	 */
+	if (task->state == TASK_STATE_QUEUED) {
 		/* delete task */
 		task->state = TASK_STATE_CANCEL;
 		list_item_del(&task->list);
-		break;
-	case TASK_STATE_RUNNING:
-		/* already running, nothing we can do about it atm */
-		if (wait) {
-			task->complete.timeout = SCHEDULE_TASK_MAX_TIME_SLICE;
-			spin_unlock_irq(&sch->lock, flags);
-			ret = wait_for_completion_timeout(&task->complete);
-			goto out;
-		} else {
-			ret = -EBUSY;
-		}
-		break;
-	default:
-		break;
 	}
 
 	spin_unlock_irq(&sch->lock, flags);
 
-out:
 	return ret;
 }