summaryrefslogtreecommitdiffstats
path: root/sound/soc/samsung
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-09-16 18:02:28 +0100
committerMark Brown <broonie@linaro.org>2013-09-17 00:50:50 +0100
commit9a8e0322f0a8c7506f4ced07ec2a7e7e2a9cbe4a (patch)
tree98cd22f799bf9f405f56baa9901190adf3be3b73 /sound/soc/samsung
parente3c51ca8fa4a0f3f13ba9be80bee2708cd723934 (diff)
downloadblackbird-obmc-linux-9a8e0322f0a8c7506f4ced07ec2a7e7e2a9cbe4a.tar.gz
blackbird-obmc-linux-9a8e0322f0a8c7506f4ced07ec2a7e7e2a9cbe4a.zip
ASoC: smdk_wm8994: Use devm_snd_soc_unregister_card()
Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound/soc/samsung')
-rw-r--r--sound/soc/samsung/smdk_wm8994.c12
1 files changed, 1 insertions, 11 deletions
diff --git a/sound/soc/samsung/smdk_wm8994.c b/sound/soc/samsung/smdk_wm8994.c
index 5fd7a05a9b9e..831972d24fb9 100644
--- a/sound/soc/samsung/smdk_wm8994.c
+++ b/sound/soc/samsung/smdk_wm8994.c
@@ -193,7 +193,7 @@ static int smdk_audio_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, board);
- ret = snd_soc_register_card(card);
+ ret = devm_snd_soc_register_card(&pdev->dev, card);
if (ret)
dev_err(&pdev->dev, "snd_soc_register_card() failed:%d\n", ret);
@@ -201,15 +201,6 @@ static int smdk_audio_probe(struct platform_device *pdev)
return ret;
}
-static int smdk_audio_remove(struct platform_device *pdev)
-{
- struct snd_soc_card *card = platform_get_drvdata(pdev);
-
- snd_soc_unregister_card(card);
-
- return 0;
-}
-
static struct platform_driver smdk_audio_driver = {
.driver = {
.name = "smdk-audio-wm8894",
@@ -217,7 +208,6 @@ static struct platform_driver smdk_audio_driver = {
.of_match_table = of_match_ptr(samsung_wm8994_of_match),
},
.probe = smdk_audio_probe,
- .remove = smdk_audio_remove,
};
module_platform_driver(smdk_audio_driver);
OpenPOWER on IntegriCloud