evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ALSA: line6: Drop superfluous spinlock for trigger

Browse source 
The trigger callback is already spinlocked, so we need no more lock
here (even for the linked substreams).  Let's drop it.

Tested-by: Chris Rorvick <chris@rorvick.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai 2015-01-23 14:49:22 +01:00
parent 5343ecf4e5
commit f2a76225b9
2 changed files with 6 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
sound/usb/line6/pcm.c
View file

@ -226,9 +226,8 @@ int snd_line6_trigger(struct snd_pcm_substream *substream, int cmd)
{ {
struct snd_line6_pcm *line6pcm = snd_pcm_substream_chip(substream); struct snd_line6_pcm *line6pcm = snd_pcm_substream_chip(substream);
struct snd_pcm_substream *s; struct snd_pcm_substream *s;
int err; int err = 0;
spin_lock(&line6pcm->lock_trigger);
clear_bit(LINE6_INDEX_PREPARED, &line6pcm->flags); clear_bit(LINE6_INDEX_PREPARED, &line6pcm->flags);
snd_pcm_group_for_each_entry(s, substream) { snd_pcm_group_for_each_entry(s, substream) {
@ -237,32 +236,23 @@ int snd_line6_trigger(struct snd_pcm_substream *substream, int cmd)
switch (s->stream) { switch (s->stream) {
case SNDRV_PCM_STREAM_PLAYBACK: case SNDRV_PCM_STREAM_PLAYBACK:
err = snd_line6_playback_trigger(line6pcm, cmd); err = snd_line6_playback_trigger(line6pcm, cmd);
if (err < 0) {
spin_unlock(&line6pcm->lock_trigger);
return err;
}
break; break;
case SNDRV_PCM_STREAM_CAPTURE: case SNDRV_PCM_STREAM_CAPTURE:
err = snd_line6_capture_trigger(line6pcm, cmd); err = snd_line6_capture_trigger(line6pcm, cmd);
if (err < 0) {
spin_unlock(&line6pcm->lock_trigger);
return err;
}
break; break;
default: default:
dev_err(line6pcm->line6->ifcdev, dev_err(line6pcm->line6->ifcdev,
"Unknown stream direction %d\n", s->stream); "Unknown stream direction %d\n", s->stream);
err = -EINVAL;
break;
} }
if (err < 0)
break;
} }
spin_unlock(&line6pcm->lock_trigger); return err;
return 0;
} }
/* control info callback */ /* control info callback */
@ -427,7 +417,6 @@ int line6_init_pcm(struct usb_line6 *line6,
spin_lock_init(&line6pcm->lock_audio_out); spin_lock_init(&line6pcm->lock_audio_out);
spin_lock_init(&line6pcm->lock_audio_in); spin_lock_init(&line6pcm->lock_audio_in);
spin_lock_init(&line6pcm->lock_trigger);
line6pcm->impulse_period = LINE6_IMPULSE_DEFAULT_PERIOD; line6pcm->impulse_period = LINE6_IMPULSE_DEFAULT_PERIOD;
line6->line6pcm = line6pcm; line6->line6pcm = line6pcm;

5
sound/usb/line6/pcm.h
View file

@ -307,11 +307,6 @@ struct snd_line6_pcm {
*/ */
spinlock_t lock_audio_in; spinlock_t lock_audio_in;
/**
Spin lock to protect trigger.
*/
spinlock_t lock_trigger;
/** /**
PCM playback volume (left and right). PCM playback volume (left and right).
*/ */