Merge remote-tracking branches 'asoc/topic/adau' and 'asoc/topic/adsp' into asoc...

[karo-tx-linux.git] / sound / soc / samsung / speyside.c

diff --git a/sound/soc/samsung/speyside.c b/sound/soc/samsung/speyside.c
index 57df90d6b7c1bfdedbb5705fc0b2b0fef47d70d4..9902efcb8ea121a99a930816d727c11c1f614258 100644 (file)
--- a/sound/soc/samsung/speyside.c
+++ b/sound/soc/samsung/speyside.c
@@ -327,23 +327,12 @@ static int speyside_probe(struct platform_device *pdev)
 
        card->dev = &pdev->dev;
 
-       ret = snd_soc_register_card(card);
-       if (ret) {
+       ret = devm_snd_soc_register_card(&pdev->dev, card);
+       if (ret)
                dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n",
                        ret);
-               return ret;
-       }
-
-       return 0;
-}
-
-static int speyside_remove(struct platform_device *pdev)
-{
-       struct snd_soc_card *card = platform_get_drvdata(pdev);
 
-       snd_soc_unregister_card(card);
-
-       return 0;
+       return ret;
 }
 
 static struct platform_driver speyside_driver = {
@@ -353,7 +342,6 @@ static struct platform_driver speyside_driver = {
                .pm = &snd_soc_pm_ops,
        },
        .probe = speyside_probe,
-       .remove = speyside_remove,
 };
 
 module_platform_driver(speyside_driver);