Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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.

-31
-10
sound/soc/sof/intel/hda-dai.c
··· 342 342 w = snd_soc_dai_get_widget(dai, substream->stream); 343 343 344 344 switch (cmd) { 345 - case SNDRV_PCM_TRIGGER_RESUME: 346 - /* set up hw_params */ 347 - ret = hda_link_pcm_prepare(substream, dai); 348 - if (ret < 0) { 349 - dev_err(dai->dev, 350 - "error: setting up hw_params during resume\n"); 351 - return ret; 352 - } 353 - 354 - fallthrough; 355 345 case SNDRV_PCM_TRIGGER_START: 356 346 case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: 357 347 snd_hdac_ext_link_stream_start(link_dev);
-1
sound/soc/sof/intel/hda-stream.c
··· 329 329 330 330 /* cmd must be for audio stream */ 331 331 switch (cmd) { 332 - case SNDRV_PCM_TRIGGER_RESUME: 333 332 case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: 334 333 case SNDRV_PCM_TRIGGER_START: 335 334 snd_sof_dsp_update_bits(sdev, HDA_DSP_HDA_BAR, SOF_HDA_INTCTL,
-20
sound/soc/sof/pcm.c
··· 395 395 case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: 396 396 stream.hdr.cmd |= SOF_IPC_STREAM_TRIG_RELEASE; 397 397 break; 398 - case SNDRV_PCM_TRIGGER_RESUME: 399 - if (spcm->stream[substream->stream].suspend_ignored) { 400 - /* 401 - * this case will be triggered when INFO_RESUME is 402 - * supported, no need to resume streams that remained 403 - * enabled in D0ix. 404 - */ 405 - spcm->stream[substream->stream].suspend_ignored = false; 406 - return 0; 407 - } 408 - 409 - /* set up hw_params */ 410 - ret = sof_pcm_prepare(component, substream); 411 - if (ret < 0) { 412 - dev_err(component->dev, 413 - "error: failed to set up hw_params upon resume\n"); 414 - return ret; 415 - } 416 - 417 - fallthrough; 418 398 case SNDRV_PCM_TRIGGER_START: 419 399 if (spcm->stream[substream->stream].suspend_ignored) { 420 400 /*