Unverified Commit eed5391f authored Dec 16, 2021 by Ranjani Sridharan Committed by Mark Brown Dec 17, 2021

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: Kai Vehmanen <kai.vehmanen@intel.com>
Reviewed-by: Rander Wang <rander.wang@intel.com>
Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Signed-off-by: Pierre-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: Mark Brown <broonie@kernel.org>

parent 0f2ee77d

sound/soc/sof/pcm.c

+0 −20

Original line number	Diff line number	Diff line
		@@ -395,26 +395,6 @@ static int sof_pcm_trigger(struct snd_soc_component *component,
		case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
		stream.hdr.cmd \|= SOF_IPC_STREAM_TRIG_RELEASE;
		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:
		if (spcm->stream[substream->stream].suspend_ignored) {
		/*