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/emux_proc.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/emux_proc.c')
-rw-r--r-- | sound/synth/emux/emux_proc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/synth/emux/emux_proc.c b/sound/synth/emux/emux_proc.c index a70a179f6947..1ba68ce30279 100644 --- a/sound/synth/emux/emux_proc.c +++ b/sound/synth/emux/emux_proc.c | |||
@@ -37,7 +37,7 @@ snd_emux_proc_info_read(struct snd_info_entry *entry, | |||
37 | int i; | 37 | int i; |
38 | 38 | ||
39 | emu = entry->private_data; | 39 | emu = entry->private_data; |
40 | down(&emu->register_mutex); | 40 | mutex_lock(&emu->register_mutex); |
41 | if (emu->name) | 41 | if (emu->name) |
42 | snd_iprintf(buf, "Device: %s\n", emu->name); | 42 | snd_iprintf(buf, "Device: %s\n", emu->name); |
43 | snd_iprintf(buf, "Ports: %d\n", emu->num_ports); | 43 | snd_iprintf(buf, "Ports: %d\n", emu->num_ports); |
@@ -56,13 +56,13 @@ snd_emux_proc_info_read(struct snd_info_entry *entry, | |||
56 | snd_iprintf(buf, "Memory Size: 0\n"); | 56 | snd_iprintf(buf, "Memory Size: 0\n"); |
57 | } | 57 | } |
58 | if (emu->sflist) { | 58 | if (emu->sflist) { |
59 | down(&emu->sflist->presets_mutex); | 59 | mutex_lock(&emu->sflist->presets_mutex); |
60 | snd_iprintf(buf, "SoundFonts: %d\n", emu->sflist->fonts_size); | 60 | snd_iprintf(buf, "SoundFonts: %d\n", emu->sflist->fonts_size); |
61 | snd_iprintf(buf, "Instruments: %d\n", emu->sflist->zone_counter); | 61 | snd_iprintf(buf, "Instruments: %d\n", emu->sflist->zone_counter); |
62 | snd_iprintf(buf, "Samples: %d\n", emu->sflist->sample_counter); | 62 | snd_iprintf(buf, "Samples: %d\n", emu->sflist->sample_counter); |
63 | snd_iprintf(buf, "Locked Instruments: %d\n", emu->sflist->zone_locked); | 63 | snd_iprintf(buf, "Locked Instruments: %d\n", emu->sflist->zone_locked); |
64 | snd_iprintf(buf, "Locked Samples: %d\n", emu->sflist->sample_locked); | 64 | snd_iprintf(buf, "Locked Samples: %d\n", emu->sflist->sample_locked); |
65 | up(&emu->sflist->presets_mutex); | 65 | mutex_unlock(&emu->sflist->presets_mutex); |
66 | } | 66 | } |
67 | #if 0 /* debug */ | 67 | #if 0 /* debug */ |
68 | if (emu->voices[0].state != SNDRV_EMUX_ST_OFF && emu->voices[0].ch >= 0) { | 68 | if (emu->voices[0].state != SNDRV_EMUX_ST_OFF && emu->voices[0].ch >= 0) { |
@@ -103,7 +103,7 @@ snd_emux_proc_info_read(struct snd_info_entry *entry, | |||
103 | snd_iprintf(buf, "sample_mode=%x, rate=%x\n", vp->reg.sample_mode, vp->reg.rate_offset); | 103 | snd_iprintf(buf, "sample_mode=%x, rate=%x\n", vp->reg.sample_mode, vp->reg.rate_offset); |
104 | } | 104 | } |
105 | #endif | 105 | #endif |
106 | up(&emu->register_mutex); | 106 | mutex_unlock(&emu->register_mutex); |
107 | } | 107 | } |
108 | 108 | ||
109 | 109 | ||