diff options
author | Ingo Molnar <mingo@elte.hu> | 2006-01-16 10:33:08 -0500 |
---|---|---|
committer | Jaroslav Kysela <perex@suse.cz> | 2006-03-22 04:25:03 -0500 |
commit | 8b7547f95cbe8a5940df62ed730646fdfcba5fda (patch) | |
tree | 704102a2b9eaef96cf8b96c46e9e48855de64ea3 /sound/isa/gus/gus_dma.c | |
parent | ef9f0a42db987e7e2df72289fb4522d24027786b (diff) |
[ALSA] semaphore -> mutex (ISA 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/isa/gus/gus_dma.c')
-rw-r--r-- | sound/isa/gus/gus_dma.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sound/isa/gus/gus_dma.c b/sound/isa/gus/gus_dma.c index 930f4bc56f34..44ee5d3674a1 100644 --- a/sound/isa/gus/gus_dma.c +++ b/sound/isa/gus/gus_dma.c | |||
@@ -149,10 +149,10 @@ static void snd_gf1_dma_interrupt(struct snd_gus_card * gus) | |||
149 | 149 | ||
150 | int snd_gf1_dma_init(struct snd_gus_card * gus) | 150 | int snd_gf1_dma_init(struct snd_gus_card * gus) |
151 | { | 151 | { |
152 | down(&gus->dma_mutex); | 152 | mutex_lock(&gus->dma_mutex); |
153 | gus->gf1.dma_shared++; | 153 | gus->gf1.dma_shared++; |
154 | if (gus->gf1.dma_shared > 1) { | 154 | if (gus->gf1.dma_shared > 1) { |
155 | up(&gus->dma_mutex); | 155 | mutex_unlock(&gus->dma_mutex); |
156 | return 0; | 156 | return 0; |
157 | } | 157 | } |
158 | gus->gf1.interrupt_handler_dma_write = snd_gf1_dma_interrupt; | 158 | gus->gf1.interrupt_handler_dma_write = snd_gf1_dma_interrupt; |
@@ -160,7 +160,7 @@ int snd_gf1_dma_init(struct snd_gus_card * gus) | |||
160 | gus->gf1.dma_data_pcm_last = | 160 | gus->gf1.dma_data_pcm_last = |
161 | gus->gf1.dma_data_synth = | 161 | gus->gf1.dma_data_synth = |
162 | gus->gf1.dma_data_synth_last = NULL; | 162 | gus->gf1.dma_data_synth_last = NULL; |
163 | up(&gus->dma_mutex); | 163 | mutex_unlock(&gus->dma_mutex); |
164 | return 0; | 164 | return 0; |
165 | } | 165 | } |
166 | 166 | ||
@@ -168,7 +168,7 @@ int snd_gf1_dma_done(struct snd_gus_card * gus) | |||
168 | { | 168 | { |
169 | struct snd_gf1_dma_block *block; | 169 | struct snd_gf1_dma_block *block; |
170 | 170 | ||
171 | down(&gus->dma_mutex); | 171 | mutex_lock(&gus->dma_mutex); |
172 | gus->gf1.dma_shared--; | 172 | gus->gf1.dma_shared--; |
173 | if (!gus->gf1.dma_shared) { | 173 | if (!gus->gf1.dma_shared) { |
174 | snd_dma_disable(gus->gf1.dma1); | 174 | snd_dma_disable(gus->gf1.dma1); |
@@ -185,7 +185,7 @@ int snd_gf1_dma_done(struct snd_gus_card * gus) | |||
185 | gus->gf1.dma_data_pcm_last = | 185 | gus->gf1.dma_data_pcm_last = |
186 | gus->gf1.dma_data_synth_last = NULL; | 186 | gus->gf1.dma_data_synth_last = NULL; |
187 | } | 187 | } |
188 | up(&gus->dma_mutex); | 188 | mutex_unlock(&gus->dma_mutex); |
189 | return 0; | 189 | return 0; |
190 | } | 190 | } |
191 | 191 | ||