Skip to content
Snippets Groups Projects
Commit 14f311fd authored by Ranjani Sridharan's avatar Ranjani Sridharan Committed by Oleksii Kutuzov
Browse files

UPSTREAM: ASoC: SOF: pcm: remove support for RESUME trigger


The SOF driver removed the support for INFO_RESUME in the commit
"ASoC: SOF: pcm: do not add SNDRV_PCM_INFO_RESUME to runtime hw info".
And resuming is handled by the ALSA core with the .prepare and
.trigger_start stages. So, remove handling of RESUME trigger in the
component driver trigger op.

Reviewed-by: default avatarKai Vehmanen <kai.vehmanen@intel.com>
Reviewed-by: default avatarRander Wang <rander.wang@intel.com>
Reviewed-by: default avatarBard Liao <yung-chuan.liao@linux.intel.com>
Change-Id: I62c52857102529397913090de4ece04040a9f50f
Signed-off-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20211216231628.344687-2-pierre-louis.bossart@linux.intel.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 89b9b42d
No related branches found
No related tags found
1 merge request!13[UPSTREAM] Add Audio-related patches from Mediatek's Release 24.0
...@@ -395,26 +395,6 @@ static int sof_pcm_trigger(struct snd_soc_component *component, ...@@ -395,26 +395,6 @@ static int sof_pcm_trigger(struct snd_soc_component *component,
case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
stream.hdr.cmd |= SOF_IPC_STREAM_TRIG_RELEASE; stream.hdr.cmd |= SOF_IPC_STREAM_TRIG_RELEASE;
break; break;
case SNDRV_PCM_TRIGGER_RESUME:
if (spcm->stream[substream->stream].suspend_ignored) {
/*
* this case will be triggered when INFO_RESUME is
* supported, no need to resume streams that remained
* enabled in D0ix.
*/
spcm->stream[substream->stream].suspend_ignored = false;
return 0;
}
/* set up hw_params */
ret = sof_pcm_prepare(component, substream);
if (ret < 0) {
dev_err(component->dev,
"error: failed to set up hw_params upon resume\n");
return ret;
}
fallthrough;
case SNDRV_PCM_TRIGGER_START: case SNDRV_PCM_TRIGGER_START:
if (spcm->stream[substream->stream].suspend_ignored) { if (spcm->stream[substream->stream].suspend_ignored) {
/* /*
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment