aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/bcm/bcm2835-i2s.c
diff options
context:
space:
mode:
authorLars-Peter Clausen <lars@metafoo.de>2013-11-28 02:50:33 -0500
committerMark Brown <broonie@linaro.org>2013-12-02 06:47:16 -0500
commit3990c516de66af940c5c366a81531787aefe81ae (patch)
tree08859dff1de12f2c2042fceb1f774d7f79f7d966 /sound/soc/bcm/bcm2835-i2s.c
parentc0d38da61d28b9fad226218acc5716c333dab3e4 (diff)
ASoC: bcm2835-i2s: Use devm_snd_dmaengine_pcm_register()
Makes the code slightly shorter. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound/soc/bcm/bcm2835-i2s.c')
-rw-r--r--sound/soc/bcm/bcm2835-i2s.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/sound/soc/bcm/bcm2835-i2s.c b/sound/soc/bcm/bcm2835-i2s.c
index f49b007c8b43..2685fe4f8427 100644
--- a/sound/soc/bcm/bcm2835-i2s.c
+++ b/sound/soc/bcm/bcm2835-i2s.c
@@ -848,7 +848,7 @@ static int bcm2835_i2s_probe(struct platform_device *pdev)
848 return ret; 848 return ret;
849 } 849 }
850 850
851 ret = snd_dmaengine_pcm_register(&pdev->dev, NULL, 0); 851 ret = devm_snd_dmaengine_pcm_register(&pdev->dev, NULL, 0);
852 if (ret) { 852 if (ret) {
853 dev_err(&pdev->dev, "Could not register PCM: %d\n", ret); 853 dev_err(&pdev->dev, "Could not register PCM: %d\n", ret);
854 return ret; 854 return ret;
@@ -862,15 +862,8 @@ static const struct of_device_id bcm2835_i2s_of_match[] = {
862 {}, 862 {},
863}; 863};
864 864
865static int bcm2835_i2s_remove(struct platform_device *pdev)
866{
867 snd_dmaengine_pcm_unregister(&pdev->dev);
868 return 0;
869}
870
871static struct platform_driver bcm2835_i2s_driver = { 865static struct platform_driver bcm2835_i2s_driver = {
872 .probe = bcm2835_i2s_probe, 866 .probe = bcm2835_i2s_probe,
873 .remove = bcm2835_i2s_remove,
874 .driver = { 867 .driver = {
875 .name = "bcm2835-i2s", 868 .name = "bcm2835-i2s",
876 .owner = THIS_MODULE, 869 .owner = THIS_MODULE,