aboutsummaryrefslogtreecommitdiff
path: root/sound/soc/samsung/goni_wm8994.c
diff options
context:
space:
mode:
authorTushar Behera <tushar.behera@linaro.org>2014-05-21 08:52:19 +0530
committerMark Brown <broonie@linaro.org>2014-05-22 00:20:11 +0100
commit7253e354e712d2cab7b640c62c8bb82653447c44 (patch)
treeef95602d86ec3ba29060f7bbd45cfc7808ab545f /sound/soc/samsung/goni_wm8994.c
parent55313bd3b09b68ce28e328e9dde79bfc389ea921 (diff)
ASoC: samsung: Use devm_snd_soc_register_component
Replaced snd_soc_register_component with its devres equivalent, devm_snd_soc_register_component. Signed-off-by: Tushar Behera <tushar.behera@linaro.org> Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound/soc/samsung/goni_wm8994.c')
-rw-r--r--sound/soc/samsung/goni_wm8994.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/sound/soc/samsung/goni_wm8994.c b/sound/soc/samsung/goni_wm8994.c
index 415ad81999c4..9506d7617223 100644
--- a/sound/soc/samsung/goni_wm8994.c
+++ b/sound/soc/samsung/goni_wm8994.c
@@ -274,8 +274,8 @@ static int __init goni_init(void)
return -ENOMEM;
/* register voice DAI here */
- ret = snd_soc_register_component(&goni_snd_device->dev, &voice_component,
- &voice_dai, 1);
+ ret = devm_snd_soc_register_component(&goni_snd_device->dev,
+ &voice_component, &voice_dai, 1);
if (ret) {
platform_device_put(goni_snd_device);
return ret;
@@ -284,17 +284,14 @@ static int __init goni_init(void)
platform_set_drvdata(goni_snd_device, &goni);
ret = platform_device_add(goni_snd_device);
- if (ret) {
- snd_soc_unregister_component(&goni_snd_device->dev);
+ if (ret)
platform_device_put(goni_snd_device);
- }
return ret;
}
static void __exit goni_exit(void)
{
- snd_soc_unregister_component(&goni_snd_device->dev);
platform_device_unregister(goni_snd_device);
}