aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/samsung/s3c2412-i2s.c
diff options
context:
space:
mode:
authorTushar Behera <tushar.behera@linaro.org>2014-05-20 23:22:19 -0400
committerMark Brown <broonie@linaro.org>2014-05-21 19:20:11 -0400
commit7253e354e712d2cab7b640c62c8bb82653447c44 (patch)
treeef95602d86ec3ba29060f7bbd45cfc7808ab545f /sound/soc/samsung/s3c2412-i2s.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/s3c2412-i2s.c')
-rw-r--r--sound/soc/samsung/s3c2412-i2s.c14
1 files changed, 1 insertions, 13 deletions
diff --git a/sound/soc/samsung/s3c2412-i2s.c b/sound/soc/samsung/s3c2412-i2s.c
index f42da8df3e3c..843f315dcb3a 100644
--- a/sound/soc/samsung/s3c2412-i2s.c
+++ b/sound/soc/samsung/s3c2412-i2s.c
@@ -179,26 +179,14 @@ static int s3c2412_iis_dev_probe(struct platform_device *pdev)
179 } 179 }
180 180
181 ret = samsung_asoc_dma_platform_register(&pdev->dev); 181 ret = samsung_asoc_dma_platform_register(&pdev->dev);
182 if (ret) { 182 if (ret)
183 pr_err("failed to register the DMA: %d\n", ret); 183 pr_err("failed to register the DMA: %d\n", ret);
184 goto err;
185 }
186 184
187 return 0;
188err:
189 snd_soc_unregister_component(&pdev->dev);
190 return ret; 185 return ret;
191} 186}
192 187
193static int s3c2412_iis_dev_remove(struct platform_device *pdev)
194{
195 snd_soc_unregister_component(&pdev->dev);
196 return 0;
197}
198
199static struct platform_driver s3c2412_iis_driver = { 188static struct platform_driver s3c2412_iis_driver = {
200 .probe = s3c2412_iis_dev_probe, 189 .probe = s3c2412_iis_dev_probe,
201 .remove = s3c2412_iis_dev_remove,
202 .driver = { 190 .driver = {
203 .name = "s3c2412-iis", 191 .name = "s3c2412-iis",
204 .owner = THIS_MODULE, 192 .owner = THIS_MODULE,