These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / sound / soc / au1x / dbdma2.c

diff --git a/kernel/sound/soc/au1x/dbdma2.c b/kernel/sound/soc/au1x/dbdma2.c
index dd94fea..5741c0a 100644 (file)
--- a/kernel/sound/soc/au1x/dbdma2.c
+++ b/kernel/sound/soc/au1x/dbdma2.c
@@ -344,14 +344,8 @@ static int au1xpsc_pcm_drvprobe(struct platform_device *pdev)
 
        platform_set_drvdata(pdev, dmadata);
 
-       return snd_soc_register_platform(&pdev->dev, &au1xpsc_soc_platform);
-}
-
-static int au1xpsc_pcm_drvremove(struct platform_device *pdev)
-{
-       snd_soc_unregister_platform(&pdev->dev);
-
-       return 0;
+       return devm_snd_soc_register_platform(&pdev->dev,
+                                             &au1xpsc_soc_platform);
 }
 
 static struct platform_driver au1xpsc_pcm_driver = {
@@ -359,7 +353,6 @@ static struct platform_driver au1xpsc_pcm_driver = {
                .name   = "au1xpsc-pcm",
        },
        .probe          = au1xpsc_pcm_drvprobe,
-       .remove         = au1xpsc_pcm_drvremove,
 };
 
 module_platform_driver(au1xpsc_pcm_driver);