]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
ASoC: SOF: pcm: remove support for RESUME trigger
authorRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Thu, 16 Dec 2021 23:16:26 +0000 (17:16 -0600)
committerMark Brown <broonie@kernel.org>
Fri, 17 Dec 2021 11:06:12 +0000 (11:06 +0000)
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>
sound/soc/sof/pcm.c

index e4446defe51e912a60279eb1620595fc2d002f8c..37fb8e6cd493f2c8ba6781232f1e89b81f15cfb2 100644 (file)
@@ -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) {
                        /*