diff options
author | Vaishali Thakkar <vthakkar1994@gmail.com> | 2015-08-14 21:51:00 -0400 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-08-19 12:04:59 -0400 |
commit | ebb75c0bdba238013976b53e256f8d13216304e4 (patch) | |
tree | b924061e60edd493c5f4c6f691b143bd503d9d6e | |
parent | 86059653ea7ca7b30ed25d6bec5807ba59a4f2e6 (diff) |
ASoC: rockchip: i2s: Adjust devm usage
Remove use of snd_soc_unregister_component in remove function
as devm_snd_soc_register_component in probe function automatically
handles it.
Also, convert call of snd_dmaengine_pcm_register to managed resource
function devm_snd_dmaengine_pcm_register and remove usage of
snd_dmaengine_pcm_unregister in probe and remove functions.
Signed-off-by: Vaishali Thakkar <vthakkar1994@gmail.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r-- | sound/soc/rockchip/rockchip_i2s.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/sound/soc/rockchip/rockchip_i2s.c b/sound/soc/rockchip/rockchip_i2s.c index acb5be53bfb4..b93610212e3d 100644 --- a/sound/soc/rockchip/rockchip_i2s.c +++ b/sound/soc/rockchip/rockchip_i2s.c | |||
@@ -483,16 +483,14 @@ static int rockchip_i2s_probe(struct platform_device *pdev) | |||
483 | goto err_suspend; | 483 | goto err_suspend; |
484 | } | 484 | } |
485 | 485 | ||
486 | ret = snd_dmaengine_pcm_register(&pdev->dev, NULL, 0); | 486 | ret = devm_snd_dmaengine_pcm_register(&pdev->dev, NULL, 0); |
487 | if (ret) { | 487 | if (ret) { |
488 | dev_err(&pdev->dev, "Could not register PCM\n"); | 488 | dev_err(&pdev->dev, "Could not register PCM\n"); |
489 | goto err_pcm_register; | 489 | return ret; |
490 | } | 490 | } |
491 | 491 | ||
492 | return 0; | 492 | return 0; |
493 | 493 | ||
494 | err_pcm_register: | ||
495 | snd_dmaengine_pcm_unregister(&pdev->dev); | ||
496 | err_suspend: | 494 | err_suspend: |
497 | if (!pm_runtime_status_suspended(&pdev->dev)) | 495 | if (!pm_runtime_status_suspended(&pdev->dev)) |
498 | i2s_runtime_suspend(&pdev->dev); | 496 | i2s_runtime_suspend(&pdev->dev); |
@@ -512,8 +510,6 @@ static int rockchip_i2s_remove(struct platform_device *pdev) | |||
512 | 510 | ||
513 | clk_disable_unprepare(i2s->mclk); | 511 | clk_disable_unprepare(i2s->mclk); |
514 | clk_disable_unprepare(i2s->hclk); | 512 | clk_disable_unprepare(i2s->hclk); |
515 | snd_dmaengine_pcm_unregister(&pdev->dev); | ||
516 | snd_soc_unregister_component(&pdev->dev); | ||
517 | 513 | ||
518 | return 0; | 514 | return 0; |
519 | } | 515 | } |