FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2025-01-16 06:31:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ASoC: rockchip: i2s: Adjust devm usage

Browse Source 
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>
This commit is contained in:
Vaishali Thakkar 2015-08-15 07:21:00 +05:30 committed by Mark Brown
parent 86059653ea
commit ebb75c0bdb
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sound/soc/rockchip/rockchip_i2s.c
View File

@ -483,16 +483,14 @@ static int rockchip_i2s_probe(struct platform_device *pdev)
goto err_suspend; goto err_suspend;
} }
ret = snd_dmaengine_pcm_register(&pdev->dev, NULL, 0); ret = devm_snd_dmaengine_pcm_register(&pdev->dev, NULL, 0);
if (ret) { if (ret) {
dev_err(&pdev->dev, "Could not register PCM\n"); dev_err(&pdev->dev, "Could not register PCM\n");
goto err_pcm_register; return ret;
} }
return 0; return 0;
err_pcm_register:
snd_dmaengine_pcm_unregister(&pdev->dev);
err_suspend: err_suspend:
if (!pm_runtime_status_suspended(&pdev->dev)) if (!pm_runtime_status_suspended(&pdev->dev))
i2s_runtime_suspend(&pdev->dev); i2s_runtime_suspend(&pdev->dev);
@ -512,8 +510,6 @@ static int rockchip_i2s_remove(struct platform_device *pdev)
clk_disable_unprepare(i2s->mclk); clk_disable_unprepare(i2s->mclk);
clk_disable_unprepare(i2s->hclk); clk_disable_unprepare(i2s->hclk);
snd_dmaengine_pcm_unregister(&pdev->dev);
snd_soc_unregister_component(&pdev->dev);
return 0; return 0;
} }