ASoC: intel: Replace runtime->status->state reference to runtime->state
authorTakashi Iwai <tiwai@suse.de>
Mon, 26 Sep 2022 13:55:56 +0000 (15:55 +0200)
committerTakashi Iwai <tiwai@suse.de>
Tue, 27 Sep 2022 06:48:57 +0000 (08:48 +0200)
The recent change in ALSA core allows drivers to get the current PCM
state directly from runtime object.  Replace the calls accordingly.

Reviewed-by: Jaroslav Kysela <perex@perex.cz>
Acked-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Link: https://lore.kernel.org/r/20220926135558.26580-10-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/soc/intel/skylake/skl-pcm.c

index 9d72ebd812af9958ba62e046ddd6fa831ead63d1..1015716f93361082f0ae9788754ed8cc57b26b24 100644 (file)
@@ -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;