aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2013-03-21 06:30:32 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2013-03-26 17:55:26 -0400
commit426c340853da49e7c55fe856408ea44f8852d8c8 (patch)
tree5f76a19878a8c6a6fd254ae252696ad7aa33e5d2
parent58309649b4feadea44c5cc3e5d410c34d81ef5d1 (diff)
ASoC: switch over to use snd_soc_register_component() on ep93xx ac97
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
-rw-r--r--sound/soc/cirrus/ep93xx-ac97.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/sound/soc/cirrus/ep93xx-ac97.c b/sound/soc/cirrus/ep93xx-ac97.c
index 1738d28fb04f..e593c1e4e1dd 100644
--- a/sound/soc/cirrus/ep93xx-ac97.c
+++ b/sound/soc/cirrus/ep93xx-ac97.c
@@ -353,6 +353,10 @@ static struct snd_soc_dai_driver ep93xx_ac97_dai = {
353 .ops = &ep93xx_ac97_dai_ops, 353 .ops = &ep93xx_ac97_dai_ops,
354}; 354};
355 355
356static const struct snd_soc_component_driver ep93xx_ac97_component = {
357 .name = "ep93xx-ac97",
358};
359
356static int ep93xx_ac97_probe(struct platform_device *pdev) 360static int ep93xx_ac97_probe(struct platform_device *pdev)
357{ 361{
358 struct ep93xx_ac97_info *info; 362 struct ep93xx_ac97_info *info;
@@ -390,7 +394,8 @@ static int ep93xx_ac97_probe(struct platform_device *pdev)
390 ep93xx_ac97_info = info; 394 ep93xx_ac97_info = info;
391 platform_set_drvdata(pdev, info); 395 platform_set_drvdata(pdev, info);
392 396
393 ret = snd_soc_register_dai(&pdev->dev, &ep93xx_ac97_dai); 397 ret = snd_soc_register_component(&pdev->dev, &ep93xx_ac97_component,
398 &ep93xx_ac97_dai, 1);
394 if (ret) 399 if (ret)
395 goto fail; 400 goto fail;
396 401
@@ -407,7 +412,7 @@ static int ep93xx_ac97_remove(struct platform_device *pdev)
407{ 412{
408 struct ep93xx_ac97_info *info = platform_get_drvdata(pdev); 413 struct ep93xx_ac97_info *info = platform_get_drvdata(pdev);
409 414
410 snd_soc_unregister_dai(&pdev->dev); 415 snd_soc_unregister_component(&pdev->dev);
411 416
412 /* disable the AC97 controller */ 417 /* disable the AC97 controller */
413 ep93xx_ac97_write_reg(info, AC97GCR, 0); 418 ep93xx_ac97_write_reg(info, AC97GCR, 0);