ASoC: samsung: Add devm_clk_get to pcm.c

[deliverable/linux.git] / sound / soc / samsung / tobermory.c

diff --git a/sound/soc/samsung/tobermory.c b/sound/soc/samsung/tobermory.c
index 1807b75ccc12d0544d79e538173a2dc47e55ed1a..6a2b9f14d6246dd8382eab01fd30cf9840c81f1e 100644 (file)
--- a/sound/soc/samsung/tobermory.c
+++ b/sound/soc/samsung/tobermory.c
@@ -223,23 +223,12 @@ static int tobermory_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 tobermory_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 tobermory_driver = {
@@ -249,7 +238,6 @@ static struct platform_driver tobermory_driver = {
                .pm = &snd_soc_pm_ops,
        },
        .probe = tobermory_probe,
-       .remove = tobermory_remove,
 };
 
 module_platform_driver(tobermory_driver);