ASoC: switch over to use snd_soc_register_component() on au1x psc-ac97
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Thu, 21 Mar 2013 10:28:50 +0000 (03:28 -0700)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 26 Mar 2013 21:55:23 +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/au1x/psc-ac97.c

index 6ba07e365967221384760d2917bc1b8850ca5895..8f1862aa733311b35552079ace7a8fa314b4c3b6 100644 (file)
@@ -361,6 +361,10 @@ static const struct snd_soc_dai_driver au1xpsc_ac97_dai_template = {
        .ops = &au1xpsc_ac97_dai_ops,
 };
 
+static const struct snd_soc_component_driver au1xpsc_ac97_component = {
+       .name           = "au1xpsc-ac97",
+};
+
 static int au1xpsc_ac97_drvprobe(struct platform_device *pdev)
 {
        int ret;
@@ -419,7 +423,8 @@ static int au1xpsc_ac97_drvprobe(struct platform_device *pdev)
 
        platform_set_drvdata(pdev, wd);
 
-       ret = snd_soc_register_dai(&pdev->dev, &wd->dai_drv);
+       ret = snd_soc_register_component(&pdev->dev, &au1xpsc_ac97_component,
+                                        &wd->dai_drv, 1);
        if (ret)
                return ret;
 
@@ -431,7 +436,7 @@ static int au1xpsc_ac97_drvremove(struct platform_device *pdev)
 {
        struct au1xpsc_audio_data *wd = platform_get_drvdata(pdev);
 
-       snd_soc_unregister_dai(&pdev->dev);
+       snd_soc_unregister_component(&pdev->dev);
 
        /* disable PSC completely */
        au_writel(0, AC97_CFG(wd));