ALSA: usx2y: 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: Jaroslav Kysela <perex@perex.cz>
Link: https://lore.kernel.org/r/20220926135558.26580-9-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/sound/usb/usx2y/usbusx2yaudio.c b/sound/usb/usx2y/usbusx2yaudio.c
index 9cd5e3aae4f77da68a06c66c719557161285b699..5197599e7aa61bb9df5a775b88ee05df4798f647 100644 (file)
--- a/sound/usb/usx2y/usbusx2yaudio.c
+++ b/sound/usb/usx2y/usbusx2yaudio.c
@@ -822,8 +822,7 @@ static int snd_usx2y_pcm_hw_free(struct snd_pcm_substream *substream)
                usx2y_urbs_release(subs);
                if (!cap_subs->pcm_substream ||
                    !cap_subs->pcm_substream->runtime ||
-                   !cap_subs->pcm_substream->runtime->status ||
-                   cap_subs->pcm_substream->runtime->status->state < SNDRV_PCM_STATE_PREPARED) {
+                   cap_subs->pcm_substream->runtime->state < SNDRV_PCM_STATE_PREPARED) {
                        atomic_set(&cap_subs->state, STATE_STOPPED);
                        usx2y_urbs_release(cap_subs);
                }

diff --git a/sound/usb/usx2y/usx2yhwdeppcm.c b/sound/usb/usx2y/usx2yhwdeppcm.c
index 240349b644f38fc41f16d3737d35361bc43856b4..767a227d54da491b533ab2bb76d1c6d5653df35a 100644 (file)
--- a/sound/usb/usx2y/usx2yhwdeppcm.c
+++ b/sound/usb/usx2y/usx2yhwdeppcm.c
@@ -374,8 +374,7 @@ static int snd_usx2y_usbpcm_hw_free(struct snd_pcm_substream *substream)
                usx2y_usbpcm_urbs_release(subs);
                if (!cap_subs->pcm_substream ||
                    !cap_subs->pcm_substream->runtime ||
-                   !cap_subs->pcm_substream->runtime->status ||
-                   cap_subs->pcm_substream->runtime->status->state < SNDRV_PCM_STATE_PREPARED) {
+                   cap_subs->pcm_substream->runtime->state < SNDRV_PCM_STATE_PREPARED) {
                        atomic_set(&cap_subs->state, STATE_STOPPED);
                        if (cap_subs2)
                                atomic_set(&cap_subs2->state, STATE_STOPPED);