aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/samsung/bells.c
diff options
context:
space:
mode:
authorTushar Behera <tushar.behera@linaro.org>2014-05-20 23:22:17 -0400
committerMark Brown <broonie@linaro.org>2014-05-21 19:20:11 -0400
commitc583883ecdca277c258c95dc8c711dfb76d23b40 (patch)
treed04f2b46fb4dc4878438720fa8d8b62721b46fde /sound/soc/samsung/bells.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/bells.c')
-rw-r--r--sound/soc/samsung/bells.c16
1 files changed, 3 insertions, 13 deletions
diff --git a/sound/soc/samsung/bells.c b/sound/soc/samsung/bells.c
index 84f5d8b76679..5b21207cf551 100644
--- a/sound/soc/samsung/bells.c
+++ b/sound/soc/samsung/bells.c
@@ -433,22 +433,13 @@ static int bells_probe(struct platform_device *pdev)
433 433
434 bells_cards[pdev->id].dev = &pdev->dev; 434 bells_cards[pdev->id].dev = &pdev->dev;
435 435
436 ret = snd_soc_register_card(&bells_cards[pdev->id]); 436 ret = devm_snd_soc_register_card(&pdev->dev, &bells_cards[pdev->id]);
437 if (ret) { 437 if (ret)
438 dev_err(&pdev->dev, 438 dev_err(&pdev->dev,
439 "snd_soc_register_card(%s) failed: %d\n", 439 "snd_soc_register_card(%s) failed: %d\n",
440 bells_cards[pdev->id].name, ret); 440 bells_cards[pdev->id].name, ret);
441 return ret;
442 }
443
444 return 0;
445}
446
447static int bells_remove(struct platform_device *pdev)
448{
449 snd_soc_unregister_card(&bells_cards[pdev->id]);
450 441
451 return 0; 442 return ret;
452} 443}
453 444
454static struct platform_driver bells_driver = { 445static struct platform_driver bells_driver = {
@@ -458,7 +449,6 @@ static struct platform_driver bells_driver = {
458 .pm = &snd_soc_pm_ops, 449 .pm = &snd_soc_pm_ops,
459 }, 450 },
460 .probe = bells_probe, 451 .probe = bells_probe,
461 .remove = bells_remove,
462}; 452};
463 453
464module_platform_driver(bells_driver); 454module_platform_driver(bells_driver);