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

[mirror_ubuntu-artful-kernel.git] / sound / soc / mxs / mxs-saif.c

diff --git a/sound/soc/mxs/mxs-saif.c b/sound/soc/mxs/mxs-saif.c
index d796a393968deb8163f6f15e36c40f2fe583a878..b563141a6543bae81dbf14289e18e01cdefd3b93 100644 (file)
--- a/sound/soc/mxs/mxs-saif.c
+++ b/sound/soc/mxs/mxs-saif.c
@@ -628,6 +628,10 @@ static struct snd_soc_dai_driver mxs_saif_dai = {
        .ops = &mxs_saif_dai_ops,
 };
 
+static const struct snd_soc_component_driver mxs_saif_component = {
+       .name           = "mxs-saif",
+};
+
 static irqreturn_t mxs_saif_irq(int irq, void *dev_id)
 {
        struct mxs_saif *saif = dev_id;
@@ -764,7 +768,8 @@ static int mxs_saif_probe(struct platform_device *pdev)
 
        platform_set_drvdata(pdev, saif);
 
-       ret = snd_soc_register_dai(&pdev->dev, &mxs_saif_dai);
+       ret = snd_soc_register_component(&pdev->dev, &mxs_saif_component,
+                                        &mxs_saif_dai, 1);
        if (ret) {
                dev_err(&pdev->dev, "register DAI failed\n");
                return ret;
@@ -779,7 +784,7 @@ static int mxs_saif_probe(struct platform_device *pdev)
        return 0;
 
 failed_pdev_alloc:
-       snd_soc_unregister_dai(&pdev->dev);
+       snd_soc_unregister_component(&pdev->dev);
 
        return ret;
 }
@@ -787,7 +792,7 @@ failed_pdev_alloc:
 static int mxs_saif_remove(struct platform_device *pdev)
 {
        mxs_pcm_platform_unregister(&pdev->dev);
-       snd_soc_unregister_dai(&pdev->dev);
+       snd_soc_unregister_component(&pdev->dev);
 
        return 0;
 }