Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit adb5145b authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ASoC: msm: qdsp6v2: remove flush wait queue"

parents 8734248f b618b3da

sound/soc/msm/qdsp6v2/msm-compress-q6-v2.c

+0 −7
Original line number Original line Diff line number Diff line
@@ -166,7 +166,6 @@ struct msm_compr_audio { 




	wait_queue_head_t eos_wait;

	wait_queue_head_t eos_wait;

	wait_queue_head_t drain_wait;

	wait_queue_head_t drain_wait;

	wait_queue_head_t flush_wait;

	wait_queue_head_t close_wait;

	wait_queue_head_t close_wait;

	wait_queue_head_t wait_for_stream_avail;

	wait_queue_head_t wait_for_stream_avail;
@@ -512,7 +511,6 @@ static void compr_event_handler(uint32_t opcode, 
			pr_debug("token 0x%x, stream id %d\n", token,

			pr_debug("token 0x%x, stream id %d\n", token,

				  STREAM_ID_FROM_TOKEN(token));

				  STREAM_ID_FROM_TOKEN(token));

			prtd->cmd_ack = 1;

			prtd->cmd_ack = 1;

			wake_up(&prtd->flush_wait);

			break;

			break;

		case ASM_DATA_CMD_REMOVE_INITIAL_SILENCE:

		case ASM_DATA_CMD_REMOVE_INITIAL_SILENCE:

			pr_debug("%s: ASM_DATA_CMD_REMOVE_INITIAL_SILENCE:",

			pr_debug("%s: ASM_DATA_CMD_REMOVE_INITIAL_SILENCE:",
@@ -1001,7 +999,6 @@ static int msm_compr_open(struct snd_compr_stream *cstream) 




	init_waitqueue_head(&prtd->eos_wait);

	init_waitqueue_head(&prtd->eos_wait);

	init_waitqueue_head(&prtd->drain_wait);

	init_waitqueue_head(&prtd->drain_wait);

	init_waitqueue_head(&prtd->flush_wait);

	init_waitqueue_head(&prtd->close_wait);

	init_waitqueue_head(&prtd->close_wait);

	init_waitqueue_head(&prtd->wait_for_stream_avail);

	init_waitqueue_head(&prtd->wait_for_stream_avail);
@@ -1432,8 +1429,6 @@ static int msm_compr_trigger(struct snd_compr_stream *cstream, int cmd) 
			spin_unlock_irqrestore(&prtd->lock, flags);

			spin_unlock_irqrestore(&prtd->lock, flags);

			q6asm_stream_cmd(

			q6asm_stream_cmd(

				prtd->audio_client, CMD_FLUSH, stream_id);

				prtd->audio_client, CMD_FLUSH, stream_id);

			wait_event_timeout(prtd->flush_wait,

					prtd->cmd_ack, 1 * HZ);

			spin_lock_irqsave(&prtd->lock, flags);

			spin_lock_irqsave(&prtd->lock, flags);

		} else {

		} else {

			prtd->first_buffer = 0;

			prtd->first_buffer = 0;
@@ -1676,8 +1671,6 @@ static int msm_compr_trigger(struct snd_compr_stream *cstream, int cmd) 
			pr_debug("%s:issue CMD_FLUSH ac->stream_id %d",

			pr_debug("%s:issue CMD_FLUSH ac->stream_id %d",

					      __func__, ac->stream_id);

					      __func__, ac->stream_id);

			q6asm_stream_cmd(ac, CMD_FLUSH, ac->stream_id);

			q6asm_stream_cmd(ac, CMD_FLUSH, ac->stream_id);

			wait_event_timeout(prtd->flush_wait,

					   prtd->cmd_ack, 1 * HZ / 4);





			q6asm_run_nowait(prtd->audio_client, 0, 0, 0);

			q6asm_run_nowait(prtd->audio_client, 0, 0, 0);

		}

		}