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, 14 deletions

diff --git a/sound/usb/misc/ua101.c b/sound/usb/misc/ua101.c
index a1bab149df4d..9581089c28c5 100644
--- a/sound/usb/misc/ua101.c
+++ b/sound/usb/misc/ua101.c
@@ -613,24 +613,14 @@ static int start_usb_playback(struct ua101 *ua)
 
 static void abort_alsa_capture(struct ua101 *ua)
 {
-        unsigned long flags;
-
-        if (test_bit(ALSA_CAPTURE_RUNNING, &ua->states)) {
-                snd_pcm_stream_lock_irqsave(ua->capture.substream, flags);
-                snd_pcm_stop(ua->capture.substream, SNDRV_PCM_STATE_XRUN);
-                snd_pcm_stream_unlock_irqrestore(ua->capture.substream, flags);
-        }
+        if (test_bit(ALSA_CAPTURE_RUNNING, &ua->states))
+                snd_pcm_stop_xrun(ua->capture.substream);
 }
 
 static void abort_alsa_playback(struct ua101 *ua)
 {
-        unsigned long flags;
-
-        if (test_bit(ALSA_PLAYBACK_RUNNING, &ua->states)) {
-                snd_pcm_stream_lock_irqsave(ua->playback.substream, flags);
-                snd_pcm_stop(ua->playback.substream, SNDRV_PCM_STATE_XRUN);
-                snd_pcm_stream_unlock_irqrestore(ua->playback.substream, flags);
-        }
+        if (test_bit(ALSA_PLAYBACK_RUNNING, &ua->states))
+                snd_pcm_stop_xrun(ua->playback.substream);
 }
 
 static int set_stream_hw(struct ua101 *ua, struct snd_pcm_substream *substream,