ALSA: line6: Drop superfluous irqsave/irqrestore in PCM trigger callback

The PCM trigger callback is guaranteed to be called already in
spinlock / irq-disabled context.

Tested-by: Chris Rorvick <chris@rorvick.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/sound/usb/line6/pcm.c b/sound/usb/line6/pcm.c
index 932cc7e194e2a2d8297a5be70bff0a984e230455..edab3cd7c048cc39568bed712b262425e2905865 100644 (file)
--- a/sound/usb/line6/pcm.c
+++ b/sound/usb/line6/pcm.c
@@ -227,9 +227,8 @@ int snd_line6_trigger(struct snd_pcm_substream *substream, int cmd)
        struct snd_line6_pcm *line6pcm = snd_pcm_substream_chip(substream);
        struct snd_pcm_substream *s;
        int err;
-       unsigned long flags;
 
-       spin_lock_irqsave(&line6pcm->lock_trigger, flags);
+       spin_lock(&line6pcm->lock_trigger);
        clear_bit(LINE6_INDEX_PREPARED, &line6pcm->flags);
 
        snd_pcm_group_for_each_entry(s, substream) {
@@ -240,8 +239,7 @@ int snd_line6_trigger(struct snd_pcm_substream *substream, int cmd)
                        err = snd_line6_playback_trigger(line6pcm, cmd);
 
                        if (err < 0) {
-                               spin_unlock_irqrestore(&line6pcm->lock_trigger,
-                                                      flags);
+                               spin_unlock(&line6pcm->lock_trigger);
                                return err;
                        }
 
@@ -251,8 +249,7 @@ int snd_line6_trigger(struct snd_pcm_substream *substream, int cmd)
                        err = snd_line6_capture_trigger(line6pcm, cmd);
 
                        if (err < 0) {
-                               spin_unlock_irqrestore(&line6pcm->lock_trigger,
-                                                      flags);
+                               spin_unlock(&line6pcm->lock_trigger);
                                return err;
                        }
 
@@ -264,7 +261,7 @@ int snd_line6_trigger(struct snd_pcm_substream *substream, int cmd)
                }
        }
 
-       spin_unlock_irqrestore(&line6pcm->lock_trigger, flags);
+       spin_unlock(&line6pcm->lock_trigger);
        return 0;
 }