OSDN Git Service

ASoC: switch over to use snd_soc_register_component() on ep93xx ac97
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Thu, 21 Mar 2013 10:30:32 +0000 (03:30 -0700)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 26 Mar 2013 21:55:26 +0000 (21:55 +0000)
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
sound/soc/cirrus/ep93xx-ac97.c

index 1738d28..e593c1e 100644 (file)
@@ -353,6 +353,10 @@ static struct snd_soc_dai_driver ep93xx_ac97_dai = {
        .ops                    = &ep93xx_ac97_dai_ops,
 };
 
+static const struct snd_soc_component_driver ep93xx_ac97_component = {
+       .name           = "ep93xx-ac97",
+};
+
 static int ep93xx_ac97_probe(struct platform_device *pdev)
 {
        struct ep93xx_ac97_info *info;
@@ -390,7 +394,8 @@ static int ep93xx_ac97_probe(struct platform_device *pdev)
        ep93xx_ac97_info = info;
        platform_set_drvdata(pdev, info);
 
-       ret = snd_soc_register_dai(&pdev->dev, &ep93xx_ac97_dai);
+       ret = snd_soc_register_component(&pdev->dev, &ep93xx_ac97_component,
+                                        &ep93xx_ac97_dai, 1);
        if (ret)
                goto fail;
 
@@ -407,7 +412,7 @@ static int ep93xx_ac97_remove(struct platform_device *pdev)
 {
        struct ep93xx_ac97_info *info = platform_get_drvdata(pdev);
 
-       snd_soc_unregister_dai(&pdev->dev);
+       snd_soc_unregister_component(&pdev->dev);
 
        /* disable the AC97 controller */
        ep93xx_ac97_write_reg(info, AC97GCR, 0);