aboutsummaryrefslogtreecommitdiffstats
path: root/sound/isa/cs423x/cs4236.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/isa/cs423x/cs4236.c')
-rw-r--r--sound/isa/cs423x/cs4236.c47
1 files changed, 22 insertions, 25 deletions
diff --git a/sound/isa/cs423x/cs4236.c b/sound/isa/cs423x/cs4236.c
index 246c221556e3..3ff0f1229910 100644
--- a/sound/isa/cs423x/cs4236.c
+++ b/sound/isa/cs423x/cs4236.c
@@ -134,7 +134,7 @@ static int pnp_registered;
134#endif /* CONFIG_PNP */ 134#endif /* CONFIG_PNP */
135 135
136struct snd_card_cs4236 { 136struct snd_card_cs4236 {
137 struct snd_cs4231 *chip; 137 struct snd_wss *chip;
138 struct resource *res_sb_port; 138 struct resource *res_sb_port;
139#ifdef CONFIG_PNP 139#ifdef CONFIG_PNP
140 struct pnp_dev *wss; 140 struct pnp_dev *wss;
@@ -396,7 +396,7 @@ static int __devinit snd_cs423x_probe(struct snd_card *card, int dev)
396{ 396{
397 struct snd_card_cs4236 *acard; 397 struct snd_card_cs4236 *acard;
398 struct snd_pcm *pcm; 398 struct snd_pcm *pcm;
399 struct snd_cs4231 *chip; 399 struct snd_wss *chip;
400 struct snd_opl3 *opl3; 400 struct snd_opl3 *opl3;
401 int err; 401 int err;
402 402
@@ -408,41 +408,37 @@ static int __devinit snd_cs423x_probe(struct snd_card *card, int dev)
408 } 408 }
409 409
410#ifdef CS4232 410#ifdef CS4232
411 if ((err = snd_cs4231_create(card, 411 err = snd_wss_create(card, port[dev], cport[dev],
412 port[dev], 412 irq[dev],
413 cport[dev], 413 dma1[dev], dma2[dev],
414 irq[dev], 414 WSS_HW_DETECT, 0, &chip);
415 dma1[dev], 415 if (err < 0)
416 dma2[dev],
417 CS4231_HW_DETECT,
418 0,
419 &chip)) < 0)
420 return err; 416 return err;
421 acard->chip = chip; 417 acard->chip = chip;
422 418
423 if ((err = snd_cs4231_pcm(chip, 0, &pcm)) < 0) 419 err = snd_wss_pcm(chip, 0, &pcm);
420 if (err < 0)
424 return err; 421 return err;
425 422
426 if ((err = snd_cs4231_mixer(chip)) < 0) 423 err = snd_wss_mixer(chip);
424 if (err < 0)
427 return err; 425 return err;
428 426
429#else /* CS4236 */ 427#else /* CS4236 */
430 if ((err = snd_cs4236_create(card, 428 err = snd_cs4236_create(card,
431 port[dev], 429 port[dev], cport[dev],
432 cport[dev], 430 irq[dev], dma1[dev], dma2[dev],
433 irq[dev], 431 WSS_HW_DETECT, 0, &chip);
434 dma1[dev], 432 if (err < 0)
435 dma2[dev],
436 CS4231_HW_DETECT,
437 0,
438 &chip)) < 0)
439 return err; 433 return err;
440 acard->chip = chip; 434 acard->chip = chip;
441 435
442 if ((err = snd_cs4236_pcm(chip, 0, &pcm)) < 0) 436 err = snd_cs4236_pcm(chip, 0, &pcm);
437 if (err < 0)
443 return err; 438 return err;
444 439
445 if ((err = snd_cs4236_mixer(chip)) < 0) 440 err = snd_cs4236_mixer(chip);
441 if (err < 0)
446 return err; 442 return err;
447#endif 443#endif
448 strcpy(card->driver, pcm->name); 444 strcpy(card->driver, pcm->name);
@@ -455,7 +451,8 @@ static int __devinit snd_cs423x_probe(struct snd_card *card, int dev)
455 if (dma2[dev] >= 0) 451 if (dma2[dev] >= 0)
456 sprintf(card->longname + strlen(card->longname), "&%d", dma2[dev]); 452 sprintf(card->longname + strlen(card->longname), "&%d", dma2[dev]);
457 453
458 if ((err = snd_cs4231_timer(chip, 0, NULL)) < 0) 454 err = snd_wss_timer(chip, 0, NULL);
455 if (err < 0)
459 return err; 456 return err;
460 457
461 if (fm_port[dev] > 0 && fm_port[dev] != SNDRV_AUTO_PORT) { 458 if (fm_port[dev] > 0 && fm_port[dev] != SNDRV_AUTO_PORT) {