diff options
Diffstat (limited to 'sound/soc/au1x/psc-ac97.c')
-rw-r--r-- | sound/soc/au1x/psc-ac97.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/sound/soc/au1x/psc-ac97.c b/sound/soc/au1x/psc-ac97.c index 6ba07e365967..8f1862aa7333 100644 --- a/sound/soc/au1x/psc-ac97.c +++ b/sound/soc/au1x/psc-ac97.c | |||
@@ -361,6 +361,10 @@ static const struct snd_soc_dai_driver au1xpsc_ac97_dai_template = { | |||
361 | .ops = &au1xpsc_ac97_dai_ops, | 361 | .ops = &au1xpsc_ac97_dai_ops, |
362 | }; | 362 | }; |
363 | 363 | ||
364 | static const struct snd_soc_component_driver au1xpsc_ac97_component = { | ||
365 | .name = "au1xpsc-ac97", | ||
366 | }; | ||
367 | |||
364 | static int au1xpsc_ac97_drvprobe(struct platform_device *pdev) | 368 | static int au1xpsc_ac97_drvprobe(struct platform_device *pdev) |
365 | { | 369 | { |
366 | int ret; | 370 | int ret; |
@@ -419,7 +423,8 @@ static int au1xpsc_ac97_drvprobe(struct platform_device *pdev) | |||
419 | 423 | ||
420 | platform_set_drvdata(pdev, wd); | 424 | platform_set_drvdata(pdev, wd); |
421 | 425 | ||
422 | ret = snd_soc_register_dai(&pdev->dev, &wd->dai_drv); | 426 | ret = snd_soc_register_component(&pdev->dev, &au1xpsc_ac97_component, |
427 | &wd->dai_drv, 1); | ||
423 | if (ret) | 428 | if (ret) |
424 | return ret; | 429 | return ret; |
425 | 430 | ||
@@ -431,7 +436,7 @@ static int au1xpsc_ac97_drvremove(struct platform_device *pdev) | |||
431 | { | 436 | { |
432 | struct au1xpsc_audio_data *wd = platform_get_drvdata(pdev); | 437 | struct au1xpsc_audio_data *wd = platform_get_drvdata(pdev); |
433 | 438 | ||
434 | snd_soc_unregister_dai(&pdev->dev); | 439 | snd_soc_unregister_component(&pdev->dev); |
435 | 440 | ||
436 | /* disable PSC completely */ | 441 | /* disable PSC completely */ |
437 | au_writel(0, AC97_CFG(wd)); | 442 | au_writel(0, AC97_CFG(wd)); |