UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

ASoC: SOF: remove suport for TRIGGER_RESUME 

Merge series from Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>:

None of the SOF platforms support INFO_RESUME, and rely on the
indirect path used by the ALSA core with the prepare and TRIGGER_START
steps.

Let's remove the left-over dead code.
This commit is contained in:
Mark Brown 2021-12-17 17:32:44 +00:00
parent f04b4fb47d 35218cf618
commit f7c7ecaba4
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
3 changed files with 0 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sound/soc/sof/intel/hda-dai.c
View File

@ -342,16 +342,6 @@ static int hda_link_pcm_trigger(struct snd_pcm_substream *substream,
w = snd_soc_dai_get_widget(dai, substream->stream); w = snd_soc_dai_get_widget(dai, substream->stream);
switch (cmd) { switch (cmd) {
case SNDRV_PCM_TRIGGER_RESUME:
/* set up hw_params */
ret = hda_link_pcm_prepare(substream, dai);
if (ret < 0) {
dev_err(dai->dev,
"error: setting up hw_params during resume\n");
return ret;
}
fallthrough;
case SNDRV_PCM_TRIGGER_START: case SNDRV_PCM_TRIGGER_START:
case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
snd_hdac_ext_link_stream_start(link_dev); snd_hdac_ext_link_stream_start(link_dev);

1
sound/soc/sof/intel/hda-stream.c
View File

@ -329,7 +329,6 @@ int hda_dsp_stream_trigger(struct snd_sof_dev *sdev,
/* cmd must be for audio stream */ /* cmd must be for audio stream */
switch (cmd) { switch (cmd) {
case SNDRV_PCM_TRIGGER_RESUME:
case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
case SNDRV_PCM_TRIGGER_START: case SNDRV_PCM_TRIGGER_START:
snd_sof_dsp_update_bits(sdev, HDA_DSP_HDA_BAR, SOF_HDA_INTCTL, snd_sof_dsp_update_bits(sdev, HDA_DSP_HDA_BAR, SOF_HDA_INTCTL,

20
sound/soc/sof/pcm.c
View File

@ -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) {
/* /*