aboutsummaryrefslogtreecommitdiffstats
path: root/sound/isa/wavefront/wavefront.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2005-11-17 08:39:06 -0500
committerJaroslav Kysela <perex@suse.cz>2006-01-03 06:18:30 -0500
commit542172f31d41e689988aedcf0d6e67dfe757736a (patch)
treecaad40a7368afc0eb719491b09e84f279b1f9bf6 /sound/isa/wavefront/wavefront.c
parent346c7a689542285aef9b899eda7693d4b912d60d (diff)
[ALSA] Remove xxx_t typedefs: ISA Wavefront
Modules: Wavefront drivers Remove xxx_t typedefs from the ISA Wavefront driver. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/isa/wavefront/wavefront.c')
-rw-r--r--sound/isa/wavefront/wavefront.c38
1 files changed, 19 insertions, 19 deletions
diff --git a/sound/isa/wavefront/wavefront.c b/sound/isa/wavefront/wavefront.c
index 1818f1013c3f..9e5b57163c0b 100644
--- a/sound/isa/wavefront/wavefront.c
+++ b/sound/isa/wavefront/wavefront.c
@@ -81,7 +81,7 @@ MODULE_PARM_DESC(fm_port, "FM port #.");
81module_param_array(use_cs4232_midi, bool, NULL, 0444); 81module_param_array(use_cs4232_midi, bool, NULL, 0444);
82MODULE_PARM_DESC(use_cs4232_midi, "Use CS4232 MPU-401 interface (inaccessibly located inside your computer)"); 82MODULE_PARM_DESC(use_cs4232_midi, "Use CS4232 MPU-401 interface (inaccessibly located inside your computer)");
83 83
84static snd_card_t *snd_wavefront_legacy[SNDRV_CARDS] = SNDRV_DEFAULT_PTR; 84static struct snd_card *snd_wavefront_legacy[SNDRV_CARDS] = SNDRV_DEFAULT_PTR;
85 85
86#ifdef CONFIG_PNP 86#ifdef CONFIG_PNP
87 87
@@ -279,12 +279,12 @@ static irqreturn_t snd_wavefront_ics2115_interrupt(int irq,
279 return IRQ_HANDLED; 279 return IRQ_HANDLED;
280} 280}
281 281
282static snd_hwdep_t * __devinit 282static struct snd_hwdep * __devinit
283snd_wavefront_new_synth (snd_card_t *card, 283snd_wavefront_new_synth (struct snd_card *card,
284 int hw_dev, 284 int hw_dev,
285 snd_wavefront_card_t *acard) 285 snd_wavefront_card_t *acard)
286{ 286{
287 snd_hwdep_t *wavefront_synth; 287 struct snd_hwdep *wavefront_synth;
288 288
289 if (snd_wavefront_detect (acard) < 0) { 289 if (snd_wavefront_detect (acard) < 0) {
290 return NULL; 290 return NULL;
@@ -305,14 +305,14 @@ snd_wavefront_new_synth (snd_card_t *card,
305 return wavefront_synth; 305 return wavefront_synth;
306} 306}
307 307
308static snd_hwdep_t * __devinit 308static struct snd_hwdep * __devinit
309snd_wavefront_new_fx (snd_card_t *card, 309snd_wavefront_new_fx (struct snd_card *card,
310 int hw_dev, 310 int hw_dev,
311 snd_wavefront_card_t *acard, 311 snd_wavefront_card_t *acard,
312 unsigned long port) 312 unsigned long port)
313 313
314{ 314{
315 snd_hwdep_t *fx_processor; 315 struct snd_hwdep *fx_processor;
316 316
317 if (snd_wavefront_fx_start (&acard->wavefront)) { 317 if (snd_wavefront_fx_start (&acard->wavefront)) {
318 snd_printk ("cannot initialize YSS225 FX processor"); 318 snd_printk ("cannot initialize YSS225 FX processor");
@@ -332,15 +332,15 @@ snd_wavefront_new_fx (snd_card_t *card,
332static snd_wavefront_mpu_id internal_id = internal_mpu; 332static snd_wavefront_mpu_id internal_id = internal_mpu;
333static snd_wavefront_mpu_id external_id = external_mpu; 333static snd_wavefront_mpu_id external_id = external_mpu;
334 334
335static snd_rawmidi_t * __devinit 335static struct snd_rawmidi *__devinit
336snd_wavefront_new_midi (snd_card_t *card, 336snd_wavefront_new_midi (struct snd_card *card,
337 int midi_dev, 337 int midi_dev,
338 snd_wavefront_card_t *acard, 338 snd_wavefront_card_t *acard,
339 unsigned long port, 339 unsigned long port,
340 snd_wavefront_mpu_id mpu) 340 snd_wavefront_mpu_id mpu)
341 341
342{ 342{
343 snd_rawmidi_t *rmidi; 343 struct snd_rawmidi *rmidi;
344 static int first = 1; 344 static int first = 1;
345 345
346 if (first) { 346 if (first) {
@@ -374,7 +374,7 @@ snd_wavefront_new_midi (snd_card_t *card,
374} 374}
375 375
376static void 376static void
377snd_wavefront_free(snd_card_t *card) 377snd_wavefront_free(struct snd_card *card)
378{ 378{
379 snd_wavefront_card_t *acard = (snd_wavefront_card_t *)card->private_data; 379 snd_wavefront_card_t *acard = (snd_wavefront_card_t *)card->private_data;
380 380
@@ -389,13 +389,13 @@ static int __devinit
389snd_wavefront_probe (int dev, struct pnp_card_link *pcard, 389snd_wavefront_probe (int dev, struct pnp_card_link *pcard,
390 const struct pnp_card_device_id *pid) 390 const struct pnp_card_device_id *pid)
391{ 391{
392 snd_card_t *card; 392 struct snd_card *card;
393 snd_wavefront_card_t *acard; 393 snd_wavefront_card_t *acard;
394 cs4231_t *chip; 394 struct snd_cs4231 *chip;
395 snd_hwdep_t *wavefront_synth; 395 struct snd_hwdep *wavefront_synth;
396 snd_rawmidi_t *ics2115_internal_rmidi = NULL; 396 struct snd_rawmidi *ics2115_internal_rmidi = NULL;
397 snd_rawmidi_t *ics2115_external_rmidi = NULL; 397 struct snd_rawmidi *ics2115_external_rmidi = NULL;
398 snd_hwdep_t *fx_processor; 398 struct snd_hwdep *fx_processor;
399 int hw_dev = 0, midi_dev = 0, err; 399 int hw_dev = 0, midi_dev = 0, err;
400 400
401#ifdef CONFIG_PNP 401#ifdef CONFIG_PNP
@@ -467,7 +467,7 @@ snd_wavefront_probe (int dev, struct pnp_card_link *pcard,
467 /* ---------- OPL3 synth --------- */ 467 /* ---------- OPL3 synth --------- */
468 468
469 if (fm_port[dev] > 0 && fm_port[dev] != SNDRV_AUTO_PORT) { 469 if (fm_port[dev] > 0 && fm_port[dev] != SNDRV_AUTO_PORT) {
470 opl3_t *opl3; 470 struct snd_opl3 *opl3;
471 471
472 if ((err = snd_opl3_create(card, 472 if ((err = snd_opl3_create(card,
473 fm_port[dev], 473 fm_port[dev],
@@ -658,7 +658,7 @@ static int __devinit snd_wavefront_pnp_detect(struct pnp_card_link *card,
658 658
659static void __devexit snd_wavefront_pnp_remove(struct pnp_card_link * pcard) 659static void __devexit snd_wavefront_pnp_remove(struct pnp_card_link * pcard)
660{ 660{
661 snd_card_t *card = (snd_card_t *) pnp_get_card_drvdata(pcard); 661 struct snd_card *card = (struct snd_card *) pnp_get_card_drvdata(pcard);
662 662
663 snd_card_disconnect(card); 663 snd_card_disconnect(card);
664 snd_card_free_in_thread(card); 664 snd_card_free_in_thread(card);