summaryrefslogtreecommitdiffstats
path: root/sound/usb/line6/midi.h
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2015-01-23 12:39:11 +0100
committerTakashi Iwai <tiwai@suse.de>2015-01-28 07:20:34 +0100
commitbc518ba4ccb487ef52e418c3ff68050cf07b3bc0 (patch)
tree9d7e78126f2e8a4a1332d7df0c6975892cf9632e /sound/usb/line6/midi.h
parentb55004f9fdee80de1b6982b3e99ebaeb7d1e7a6c (diff)
ALSA: line6: Reduce superfluous spinlock in midi.c
The midi_transmit_lock is used always inside the send_urb_lock, thus it doesn't play any role. Let's kill it. Also, rename "send_urb_lock" as a more simple name "lock" since this is the only lock for midi. Tested-by: Chris Rorvick <chris@rorvick.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/usb/line6/midi.h')
-rw-r--r--sound/usb/line6/midi.h7
1 files changed, 1 insertions, 6 deletions
diff --git a/sound/usb/line6/midi.h b/sound/usb/line6/midi.h
index ba6bf3828aa..9d9467b2613 100644
--- a/sound/usb/line6/midi.h
+++ b/sound/usb/line6/midi.h
@@ -40,14 +40,9 @@ struct snd_line6_midi {
int num_active_send_urbs;
/**
- Spin lock to protect updates of send_urb.
- */
- spinlock_t send_urb_lock;
-
- /**
Spin lock to protect MIDI buffer handling.
*/
- spinlock_t midi_transmit_lock;
+ spinlock_t lock;
/**
Wait queue for MIDI transmission.