Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ebb75c0b authored by Vaishali Thakkar's avatar Vaishali Thakkar Committed by Mark Brown
Browse files

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: default avatarVaishali Thakkar <vthakkar1994@gmail.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 86059653

sound/soc/rockchip/rockchip_i2s.c

+2 −6
Original line number Diff line number Diff line
@@ -483,16 +483,14 @@ static int rockchip_i2s_probe(struct platform_device *pdev) 
		goto err_suspend;

	}



	ret = snd_dmaengine_pcm_register(&pdev->dev, NULL, 0);

	ret = devm_snd_dmaengine_pcm_register(&pdev->dev, NULL, 0);

	if (ret) {

		dev_err(&pdev->dev, "Could not register PCM\n");

		goto err_pcm_register;

		return ret;

	}



	return 0;



err_pcm_register:

	snd_dmaengine_pcm_unregister(&pdev->dev);

err_suspend:

	if (!pm_runtime_status_suspended(&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->hclk);

	snd_dmaengine_pcm_unregister(&pdev->dev);

	snd_soc_unregister_component(&pdev->dev);



	return 0;

}