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>

2 files changed, 4 insertions, 14 deletions

diff --git a/sound/firewire/amdtp.c b/sound/firewire/amdtp.c
index 95fc2eaf11dc..3badc70124ab 100644
--- a/sound/firewire/amdtp.c
+++ b/sound/firewire/amdtp.c
@@ -1006,11 +1006,7 @@ void amdtp_stream_pcm_abort(struct amdtp_stream *s)
         struct snd_pcm_substream *pcm;
 
         pcm = ACCESS_ONCE(s->pcm);
-        if (pcm) {
-                snd_pcm_stream_lock_irq(pcm);
-                if (snd_pcm_running(pcm))
-                        snd_pcm_stop(pcm, SNDRV_PCM_STATE_XRUN);
-                snd_pcm_stream_unlock_irq(pcm);
-        }
+        if (pcm)
+                snd_pcm_stop_xrun(pcm);
 }
 EXPORT_SYMBOL(amdtp_stream_pcm_abort);
diff --git a/sound/firewire/isight.c b/sound/firewire/isight.c
index 7ac94439e758..48d6dca471c6 100644
--- a/sound/firewire/isight.c
+++ b/sound/firewire/isight.c
@@ -131,14 +131,8 @@ static void isight_samples(struct isight *isight,
 
 static void isight_pcm_abort(struct isight *isight)
 {
-        unsigned long flags;
-
-        if (ACCESS_ONCE(isight->pcm_active)) {
-                snd_pcm_stream_lock_irqsave(isight->pcm, flags);
-                if (snd_pcm_running(isight->pcm))
-                        snd_pcm_stop(isight->pcm, SNDRV_PCM_STATE_XRUN);
-                snd_pcm_stream_unlock_irqrestore(isight->pcm, flags);
-        }
+        if (ACCESS_ONCE(isight->pcm_active))
+                snd_pcm_stop_xrun(isight->pcm);
 }
 
 static void isight_dropped_samples(struct isight *isight, unsigned int total)