ALSA: 6fire: Clean ups with guard()
PATCH 1/1 ALSA: 6fire: Clean ups with guard()
Simple code cleanups with the guard() for spinlock and mutex. No functional changes.
Signed-off-by Takashi Iwai <[email protected]>
--- sound/usb/6fire/chip.c | 40 ++++++++++---------- sound/usb/6fire/midi.c | 21 +++-------- sound/usb/6fire/pcm.c | 83 ++++++++++++++++++------------------------ 3 files changed, 59 insertions(+), 85 deletions(-)
sound/usb/6fire/chip.c +19 -21
@@ -88,24 +88,22 @@ static int usb6fire_chip_probe(struct usb_interface *intf,struct snd_card *card =NULL ;/* look if we already serve this card and return if so */ -mutex_lock (®ister_mutex); -for (i =0 ; i <SNDRV_CARDS ; i++) { -if (devices[i] == device) { -if (chips[i]) - chips[i]->intf_count++; -usb_set_intfdata (intf, chips[i]); -mutex_unlock (®ister_mutex); -return 0 ; - }else if (!devices[i] && regidx <0 ) - regidx = i; + scoped_guard(mutex, ®ister_mutex) { +for (i =0 ; i <SNDRV_CARDS ; i++) { +if (devices[i] == device) { +if (chips[i]) + chips[i]->intf_count++; +usb_set_intfdata (intf, chips[i]); +return 0 ; + }else if (!devices[i] && regidx <0 ) + regidx = i; + } +if (regidx <0 ) { +dev_err (&intf->dev,"too many cards registered.\n" ); +return -ENODEV ; + } + devices[regidx] = device; } -if (regidx <0 ) { -mutex_unlock (®ister_mutex); -dev_err (&intf->dev,"too many cards registered.\n" ); -return -ENODEV ; - } - devices[regidx] = device; -mutex_unlock (®ister_mutex);/* check, if firmware is present on device, upload it if not */ ret =usb6fire_fw_init (intf);
@@ -175,10 +173,10 @@ static void usb6fire_chip_disconnect(struct usb_interface *intf)if (chip) {/* if !chip, fw upload has been performed */ chip->intf_count--;if (!chip->intf_count) { -mutex_lock (®ister_mutex); - devices[chip->regidx] =NULL ; - chips[chip->regidx] =NULL ; -mutex_unlock (®ister_mutex); + scoped_guard(mutex, ®ister_mutex) { + devices[chip->regidx] =NULL ; + chips[chip->regidx] =NULL ; + } chip->shutdown = true;usb6fire_chip_abort (chip);
sound/usb/6fire/midi.c +5 -16
@@ -23,9 +23,8 @@ static void usb6fire_midi_out_handler(struct urb *urb) {struct midi_runtime *rt = urb->context;int ret; -unsigned long flags; -spin_lock_irqsave (&rt->out_lock, flags); +guard (spinlock_irqsave)(&rt->out_lock);if (rt->out) { ret = snd_rawmidi_transmit(rt->out, rt->out_buffer + 4,
@@ -43,18 +42,14 @@ static void usb6fire_midi_out_handler(struct urb *urb) }else /* no more data to transmit */ rt->out =NULL ; } -spin_unlock_irqrestore (&rt->out_lock, flags); }static void usb6fire_midi_in_received (struct midi_runtime *rt,u8 *data,int length) { -unsigned long flags; - -spin_lock_irqsave (&rt->in_lock, flags); +guard (spinlock_irqsave)(&rt->in_lock);if (rt->in)snd_rawmidi_receive (rt->in, data, length); -spin_unlock_irqrestore (&rt->in_lock, flags); }static int usb6fire_midi_out_open (struct snd_rawmidi_substream *alsa_sub)
@@ -73,14 +68,11 @@ static void usb6fire_midi_out_trigger(struct midi_runtime *rt = alsa_sub->rmidi->private_data;struct urb *urb = &rt->out_urb;__s8 ret; -unsigned long flags; -spin_lock_irqsave (&rt->out_lock, flags); +guard (spinlock_irqsave)(&rt->out_lock);if (up) {/* start transfer */ -if (rt->out) {/* we are already transmitting so just return */ -spin_unlock_irqrestore (&rt->out_lock, flags); +if (rt->out)/* we are already transmitting so just return */ return ; - } ret =snd_rawmidi_transmit (alsa_sub, rt->out_buffer +4 ,MIDI_BUFSIZE -4 );
@@ -99,7 +91,6 @@ static void usb6fire_midi_out_trigger( } }else if (rt->out == alsa_sub) rt->out =NULL ; -spin_unlock_irqrestore (&rt->out_lock, flags); }static void usb6fire_midi_out_drain (struct snd_rawmidi_substream *alsa_sub)
@@ -125,14 +116,12 @@ static void usb6fire_midi_in_trigger( struct snd_rawmidi_substream *alsa_sub, int up) {struct midi_runtime *rt = alsa_sub->rmidi->private_data; -unsigned long flags; -spin_lock_irqsave (&rt->in_lock, flags); +guard (spinlock_irqsave)(&rt->in_lock);if (up) rt->in = alsa_sub;else rt->in =NULL ; -spin_unlock_irqrestore (&rt->in_lock, flags); }static const struct snd_rawmidi_ops out_ops = {
sound/usb/6fire/pcm.c +35 -48
196 lines not on this page · raw message
Signature · 1 line
2.50.1