ALSA: pcm: Add snd_pcm_stop_xrun() helper

Add a new helper function snd_pcm_stop_xrun() to the standard sequnce
lock/snd_pcm_stop(XRUN)/unlock by a single call, and replace the
existing open codes with this helper.

The function checks the PCM running state to prevent setting the wrong
state, too, for more safety.

Signed-off-by: Takashi Iwai <tiwai@suse.de>

1 files changed, 4 insertions, 13 deletions

diff --git a/sound/usb/6fire/pcm.c b/sound/usb/6fire/pcm.c
index ba40489b2de4..36f4115eb1cd 100644
--- a/sound/usb/6fire/pcm.c
+++ b/sound/usb/6fire/pcm.c
@@ -679,25 +679,16 @@ int usb6fire_pcm_init(struct sfire_chip *chip)
 void usb6fire_pcm_abort(struct sfire_chip *chip)
 {
         struct pcm_runtime *rt = chip->pcm;
-        unsigned long flags;
         int i;
 
         if (rt) {
                 rt->panic = true;
 
-                if (rt->playback.instance) {
-                        snd_pcm_stream_lock_irqsave(rt->playback.instance, flags);
-                        snd_pcm_stop(rt->playback.instance,
-                                        SNDRV_PCM_STATE_XRUN);
-                        snd_pcm_stream_unlock_irqrestore(rt->playback.instance, flags);
-                }
+                if (rt->playback.instance)
+                        snd_pcm_stop_xrun(rt->playback.instance);
 
-                if (rt->capture.instance) {
-                        snd_pcm_stream_lock_irqsave(rt->capture.instance, flags);
-                        snd_pcm_stop(rt->capture.instance,
-                                        SNDRV_PCM_STATE_XRUN);
-                        snd_pcm_stream_unlock_irqrestore(rt->capture.instance, flags);
-                }
+                if (rt->capture.instance)
+                        snd_pcm_stop_xrun(rt->capture.instance);
 
                 for (i = 0; i < PCM_N_URBS; i++) {
                         usb_poison_urb(&rt->in_urbs[i].instance);