Merge remote-tracking branch 'asoc/topic/component' into asoc-next

1 files changed, 7 insertions, 2 deletions

diff --git a/sound/soc/nuc900/nuc900-ac97.c b/sound/soc/nuc900/nuc900-ac97.c
index 0418467a4848..fe3285ceaf5b 100644
--- a/sound/soc/nuc900/nuc900-ac97.c
+++ b/sound/soc/nuc900/nuc900-ac97.c
@@ -314,6 +314,10 @@ static struct snd_soc_dai_driver nuc900_ac97_dai = {
         .ops = &nuc900_ac97_dai_ops,
 };
 
+static const struct snd_soc_component_driver nuc900_ac97_component = {
+        .name           = "nuc900-ac97",
+};
+
 static int nuc900_ac97_drvprobe(struct platform_device *pdev)
 {
         struct nuc900_audio *nuc900_audio;
@@ -361,7 +365,8 @@ static int nuc900_ac97_drvprobe(struct platform_device *pdev)
 
         nuc900_ac97_data = nuc900_audio;
 
-        ret = snd_soc_register_dai(&pdev->dev, &nuc900_ac97_dai);
+        ret = snd_soc_register_component(&pdev->dev, &nuc900_ac97_component,
+                                         &nuc900_ac97_dai, 1);
         if (ret)
                 goto out3;
 
@@ -384,7 +389,7 @@ out0:
 
 static int nuc900_ac97_drvremove(struct platform_device *pdev)
 {
-        snd_soc_unregister_dai(&pdev->dev);
+        snd_soc_unregister_component(&pdev->dev);
 
         clk_put(nuc900_ac97_data->clk);
         iounmap(nuc900_ac97_data->mmio);