diff options
author | Ingo Molnar <mingo@elte.hu> | 2006-01-16 10:31:42 -0500 |
---|---|---|
committer | Jaroslav Kysela <perex@suse.cz> | 2006-03-22 04:24:57 -0500 |
commit | ef9f0a42db987e7e2df72289fb4522d24027786b (patch) | |
tree | 34f3ad0c1abdbeb6df5a1d5137db6b4f34695f5a /sound/synth/emux/soundfont.c | |
parent | 1a60d4c5a0c4028559585a74e48593b16e1ca9b2 (diff) |
[ALSA] semaphore -> mutex (driver part)
Semaphore to mutex conversion.
The conversion was generated via scripts, and the result was validated
automatically via a script as well.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/synth/emux/soundfont.c')
-rw-r--r-- | sound/synth/emux/soundfont.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/synth/emux/soundfont.c b/sound/synth/emux/soundfont.c index 4c5754d4a2e8..32c27162dfb6 100644 --- a/sound/synth/emux/soundfont.c +++ b/sound/synth/emux/soundfont.c | |||
@@ -79,7 +79,7 @@ static void | |||
79 | lock_preset(struct snd_sf_list *sflist) | 79 | lock_preset(struct snd_sf_list *sflist) |
80 | { | 80 | { |
81 | unsigned long flags; | 81 | unsigned long flags; |
82 | down(&sflist->presets_mutex); | 82 | mutex_lock(&sflist->presets_mutex); |
83 | spin_lock_irqsave(&sflist->lock, flags); | 83 | spin_lock_irqsave(&sflist->lock, flags); |
84 | sflist->presets_locked = 1; | 84 | sflist->presets_locked = 1; |
85 | spin_unlock_irqrestore(&sflist->lock, flags); | 85 | spin_unlock_irqrestore(&sflist->lock, flags); |
@@ -96,7 +96,7 @@ unlock_preset(struct snd_sf_list *sflist) | |||
96 | spin_lock_irqsave(&sflist->lock, flags); | 96 | spin_lock_irqsave(&sflist->lock, flags); |
97 | sflist->presets_locked = 0; | 97 | sflist->presets_locked = 0; |
98 | spin_unlock_irqrestore(&sflist->lock, flags); | 98 | spin_unlock_irqrestore(&sflist->lock, flags); |
99 | up(&sflist->presets_mutex); | 99 | mutex_unlock(&sflist->presets_mutex); |
100 | } | 100 | } |
101 | 101 | ||
102 | 102 | ||
@@ -1390,7 +1390,7 @@ snd_sf_new(struct snd_sf_callback *callback, struct snd_util_memhdr *hdr) | |||
1390 | if ((sflist = kzalloc(sizeof(*sflist), GFP_KERNEL)) == NULL) | 1390 | if ((sflist = kzalloc(sizeof(*sflist), GFP_KERNEL)) == NULL) |
1391 | return NULL; | 1391 | return NULL; |
1392 | 1392 | ||
1393 | init_MUTEX(&sflist->presets_mutex); | 1393 | mutex_init(&sflist->presets_mutex); |
1394 | spin_lock_init(&sflist->lock); | 1394 | spin_lock_init(&sflist->lock); |
1395 | sflist->memhdr = hdr; | 1395 | sflist->memhdr = hdr; |
1396 | 1396 | ||