summaryrefslogtreecommitdiff
path: root/sound/soc/samsung/smdk_wm8994pcm.c
diff options
context:
space:
mode:
authorTushar Behera <tushar.behera@linaro.org>2014-05-21 08:52:17 +0530
committerMark Brown <broonie@linaro.org>2014-05-22 00:20:11 +0100
commitc583883ecdca277c258c95dc8c711dfb76d23b40 (patch)
treed04f2b46fb4dc4878438720fa8d8b62721b46fde /sound/soc/samsung/smdk_wm8994pcm.c
parentfbfad49076646165bbd72de4dccf1d5132ab7856 (diff)
ASoC: samsung: Use devm_snd_soc_register_card
Replace snd_soc_register_card with devm_snd_soc_register_card. With this change, we can delete the empty remove functions. Signed-off-by: Tushar Behera <tushar.behera@linaro.org> Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound/soc/samsung/smdk_wm8994pcm.c')
-rw-r--r--sound/soc/samsung/smdk_wm8994pcm.c15
1 files changed, 3 insertions, 12 deletions
diff --git a/sound/soc/samsung/smdk_wm8994pcm.c b/sound/soc/samsung/smdk_wm8994pcm.c
index 0c84ca099612..b6c09979be1f 100644
--- a/sound/soc/samsung/smdk_wm8994pcm.c
+++ b/sound/soc/samsung/smdk_wm8994pcm.c
@@ -134,19 +134,11 @@ static int snd_smdk_probe(struct platform_device *pdev)
int ret = 0;
smdk_pcm.dev = &pdev->dev;
- ret = snd_soc_register_card(&smdk_pcm);
- if (ret) {
+ ret = devm_snd_soc_register_card(&pdev->dev, &smdk_pcm);
+ if (ret)
dev_err(&pdev->dev, "snd_soc_register_card failed %d\n", ret);
- return ret;
- }
- return 0;
-}
-
-static int snd_smdk_remove(struct platform_device *pdev)
-{
- snd_soc_unregister_card(&smdk_pcm);
- return 0;
+ return ret;
}
static struct platform_driver snd_smdk_driver = {
@@ -155,7 +147,6 @@ static struct platform_driver snd_smdk_driver = {
.name = "samsung-smdk-pcm",
},
.probe = snd_smdk_probe,
- .remove = snd_smdk_remove,
};
module_platform_driver(snd_smdk_driver);