aboutsummaryrefslogtreecommitdiffstats
path: root/sound/isa/gus/gus_dma.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2005-11-17 08:36:44 -0500
committerJaroslav Kysela <perex@suse.cz>2006-01-03 06:18:27 -0500
commit5e2da20648e39a0e3cb33861499b686a6fe38112 (patch)
treee5f3117e2f44b262f9b6d45cfbd9e17a0ea913bd /sound/isa/gus/gus_dma.c
parent029d64b0cfa30abc10f722e2f67d282abe09c9da (diff)
[ALSA] Remove xxx_t typedefs: ISA GUS
Remove xxx_t typedefs from the ISA GUS drivers. 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.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/sound/isa/gus/gus_dma.c b/sound/isa/gus/gus_dma.c
index ef1b2e9832e4..930f4bc56f34 100644
--- a/sound/isa/gus/gus_dma.c
+++ b/sound/isa/gus/gus_dma.c
@@ -25,7 +25,7 @@
25#include <sound/core.h> 25#include <sound/core.h>
26#include <sound/gus.h> 26#include <sound/gus.h>
27 27
28static void snd_gf1_dma_ack(snd_gus_card_t * gus) 28static void snd_gf1_dma_ack(struct snd_gus_card * gus)
29{ 29{
30 unsigned long flags; 30 unsigned long flags;
31 31
@@ -35,7 +35,7 @@ static void snd_gf1_dma_ack(snd_gus_card_t * gus)
35 spin_unlock_irqrestore(&gus->reg_lock, flags); 35 spin_unlock_irqrestore(&gus->reg_lock, flags);
36} 36}
37 37
38static void snd_gf1_dma_program(snd_gus_card_t * gus, 38static void snd_gf1_dma_program(struct snd_gus_card * gus,
39 unsigned int addr, 39 unsigned int addr,
40 unsigned long buf_addr, 40 unsigned long buf_addr,
41 unsigned int count, 41 unsigned int count,
@@ -91,9 +91,9 @@ static void snd_gf1_dma_program(snd_gus_card_t * gus,
91 spin_unlock_irqrestore(&gus->reg_lock, flags); 91 spin_unlock_irqrestore(&gus->reg_lock, flags);
92} 92}
93 93
94static snd_gf1_dma_block_t *snd_gf1_dma_next_block(snd_gus_card_t * gus) 94static struct snd_gf1_dma_block *snd_gf1_dma_next_block(struct snd_gus_card * gus)
95{ 95{
96 snd_gf1_dma_block_t *block; 96 struct snd_gf1_dma_block *block;
97 97
98 /* PCM block have bigger priority than synthesizer one */ 98 /* PCM block have bigger priority than synthesizer one */
99 if (gus->gf1.dma_data_pcm) { 99 if (gus->gf1.dma_data_pcm) {
@@ -123,9 +123,9 @@ static snd_gf1_dma_block_t *snd_gf1_dma_next_block(snd_gus_card_t * gus)
123} 123}
124 124
125 125
126static void snd_gf1_dma_interrupt(snd_gus_card_t * gus) 126static void snd_gf1_dma_interrupt(struct snd_gus_card * gus)
127{ 127{
128 snd_gf1_dma_block_t *block; 128 struct snd_gf1_dma_block *block;
129 129
130 snd_gf1_dma_ack(gus); 130 snd_gf1_dma_ack(gus);
131 if (gus->gf1.dma_ack) 131 if (gus->gf1.dma_ack)
@@ -147,7 +147,7 @@ static void snd_gf1_dma_interrupt(snd_gus_card_t * gus)
147#endif 147#endif
148} 148}
149 149
150int snd_gf1_dma_init(snd_gus_card_t * gus) 150int snd_gf1_dma_init(struct snd_gus_card * gus)
151{ 151{
152 down(&gus->dma_mutex); 152 down(&gus->dma_mutex);
153 gus->gf1.dma_shared++; 153 gus->gf1.dma_shared++;
@@ -164,9 +164,9 @@ int snd_gf1_dma_init(snd_gus_card_t * gus)
164 return 0; 164 return 0;
165} 165}
166 166
167int snd_gf1_dma_done(snd_gus_card_t * gus) 167int snd_gf1_dma_done(struct snd_gus_card * gus)
168{ 168{
169 snd_gf1_dma_block_t *block; 169 struct snd_gf1_dma_block *block;
170 170
171 down(&gus->dma_mutex); 171 down(&gus->dma_mutex);
172 gus->gf1.dma_shared--; 172 gus->gf1.dma_shared--;
@@ -189,13 +189,13 @@ int snd_gf1_dma_done(snd_gus_card_t * gus)
189 return 0; 189 return 0;
190} 190}
191 191
192int snd_gf1_dma_transfer_block(snd_gus_card_t * gus, 192int snd_gf1_dma_transfer_block(struct snd_gus_card * gus,
193 snd_gf1_dma_block_t * __block, 193 struct snd_gf1_dma_block * __block,
194 int atomic, 194 int atomic,
195 int synth) 195 int synth)
196{ 196{
197 unsigned long flags; 197 unsigned long flags;
198 snd_gf1_dma_block_t *block; 198 struct snd_gf1_dma_block *block;
199 199
200 block = kmalloc(sizeof(*block), atomic ? GFP_ATOMIC : GFP_KERNEL); 200 block = kmalloc(sizeof(*block), atomic ? GFP_ATOMIC : GFP_KERNEL);
201 if (block == NULL) { 201 if (block == NULL) {