Commit 2bd2dc26 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ASoC: intel: Replace runtime->status->state reference to runtime->state 



The recent change in ALSA core allows drivers to get the current PCM
state directly from runtime object.  Replace the calls accordingly.

Reviewed-by: default avatarJaroslav Kysela <perex@perex.cz>
Acked-by: default avatarMark Brown <broonie@kernel.org>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Link: https://lore.kernel.org/r/20220926135558.26580-10-tiwai@suse.de


Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent ca4833c5

sound/soc/intel/skylake/skl-pcm.c

+2 −2
Original line number Diff line number Diff line
@@ -275,7 +275,7 @@ static int skl_pcm_prepare(struct snd_pcm_substream *substream, 
	 * calls prepare another time, reset the FW pipe to clean state

	 */

	if (mconfig &&

		(substream->runtime->status->state == SNDRV_PCM_STATE_XRUN ||

		(substream->runtime->state == SNDRV_PCM_STATE_XRUN ||

		 mconfig->pipe->state == SKL_PIPE_CREATED ||

		 mconfig->pipe->state == SKL_PIPE_PAUSED)) {
@@ -593,7 +593,7 @@ static int skl_link_pcm_prepare(struct snd_pcm_substream *substream, 
	/* In case of XRUN recovery, reset the FW pipe to clean state */

	mconfig = skl_tplg_be_get_cpr_module(dai, substream->stream);

	if (mconfig && !mconfig->pipe->passthru &&

		(substream->runtime->status->state == SNDRV_PCM_STATE_XRUN))

		(substream->runtime->state == SNDRV_PCM_STATE_XRUN))

		skl_reset_pipe(skl, mconfig->pipe);



	return 0;