aboutsummaryrefslogtreecommitdiffstats
path: root/sound/isa/gus/gusextreme.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/isa/gus/gusextreme.c')
-rw-r--r--sound/isa/gus/gusextreme.c26
1 files changed, 13 insertions, 13 deletions
diff --git a/sound/isa/gus/gusextreme.c b/sound/isa/gus/gusextreme.c
index d2e7cb1df537..9be59d501333 100644
--- a/sound/isa/gus/gusextreme.c
+++ b/sound/isa/gus/gusextreme.c
@@ -85,14 +85,14 @@ MODULE_PARM_DESC(channels, "GF1 channels for GUS Extreme driver.");
85module_param_array(pcm_channels, int, NULL, 0444); 85module_param_array(pcm_channels, int, NULL, 0444);
86MODULE_PARM_DESC(pcm_channels, "Reserved PCM channels for GUS Extreme driver."); 86MODULE_PARM_DESC(pcm_channels, "Reserved PCM channels for GUS Extreme driver.");
87 87
88static snd_card_t *snd_gusextreme_cards[SNDRV_CARDS] = SNDRV_DEFAULT_PTR; 88static struct snd_card *snd_gusextreme_cards[SNDRV_CARDS] = SNDRV_DEFAULT_PTR;
89 89
90#define PFX "gusextreme: " 90#define PFX "gusextreme: "
91 91
92static int __init snd_gusextreme_detect(int dev, 92static int __init snd_gusextreme_detect(int dev,
93 snd_card_t * card, 93 struct snd_card *card,
94 snd_gus_card_t * gus, 94 struct snd_gus_card * gus,
95 es1688_t *es1688) 95 struct snd_es1688 *es1688)
96{ 96{
97 unsigned long flags; 97 unsigned long flags;
98 unsigned char d; 98 unsigned char d;
@@ -139,15 +139,15 @@ static int __init snd_gusextreme_detect(int dev,
139 return 0; 139 return 0;
140} 140}
141 141
142static void __init snd_gusextreme_init(int dev, snd_gus_card_t * gus) 142static void __init snd_gusextreme_init(int dev, struct snd_gus_card * gus)
143{ 143{
144 gus->joystick_dac = joystick_dac[dev]; 144 gus->joystick_dac = joystick_dac[dev];
145} 145}
146 146
147static int __init snd_gusextreme_mixer(es1688_t *chip) 147static int __init snd_gusextreme_mixer(struct snd_es1688 *chip)
148{ 148{
149 snd_card_t *card = chip->card; 149 struct snd_card *card = chip->card;
150 snd_ctl_elem_id_t id1, id2; 150 struct snd_ctl_elem_id id1, id2;
151 int err; 151 int err;
152 152
153 memset(&id1, 0, sizeof(id1)); 153 memset(&id1, 0, sizeof(id1));
@@ -173,11 +173,11 @@ static int __init snd_gusextreme_probe(int dev)
173 static int possible_gf1_irqs[] = {5, 11, 12, 9, 7, 15, 3, -1}; 173 static int possible_gf1_irqs[] = {5, 11, 12, 9, 7, 15, 3, -1};
174 static int possible_gf1_dmas[] = {5, 6, 7, 1, 3, -1}; 174 static int possible_gf1_dmas[] = {5, 6, 7, 1, 3, -1};
175 int xgf1_irq, xgf1_dma, xess_irq, xmpu_irq, xess_dma; 175 int xgf1_irq, xgf1_dma, xess_irq, xmpu_irq, xess_dma;
176 snd_card_t *card; 176 struct snd_card *card;
177 struct snd_gusextreme *acard; 177 struct snd_gusextreme *acard;
178 snd_gus_card_t *gus; 178 struct snd_gus_card *gus;
179 es1688_t *es1688; 179 struct snd_es1688 *es1688;
180 opl3_t *opl3; 180 struct snd_opl3 *opl3;
181 int err; 181 int err;
182 182
183 card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0); 183 card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);
@@ -345,7 +345,7 @@ static int __init alsa_card_gusextreme_init(void)
345static void __exit alsa_card_gusextreme_exit(void) 345static void __exit alsa_card_gusextreme_exit(void)
346{ 346{
347 int idx; 347 int idx;
348 snd_card_t *card; 348 struct snd_card *card;
349 struct snd_gusextreme *acard; 349 struct snd_gusextreme *acard;
350 350
351 for (idx = 0; idx < SNDRV_CARDS; idx++) { 351 for (idx = 0; idx < SNDRV_CARDS; idx++) {