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

Commit b6bb3709 authored by Peter Ujfalusi's avatar Peter Ujfalusi Committed by Mark Brown
Browse files

ASoC: davinci-mcasp: Convert to use devm_snd_soc_register_component() 



It allows to remove code from the cleanup paths.

Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent 70e7a023

sound/soc/davinci/davinci-mcasp.c

+7 −10
Original line number Diff line number Diff line
@@ -1134,7 +1134,7 @@ static int davinci_mcasp_probe(struct platform_device *pdev) 
	if (!mcasp->base) {

		dev_err(&pdev->dev, "ioremap failed\n");

		ret = -ENOMEM;

		goto err_release_clk;

		goto err;

	}



	mcasp->op_mode = pdata->op_mode;
@@ -1215,11 +1215,12 @@ static int davinci_mcasp_probe(struct platform_device *pdev) 


	mcasp_reparent_fck(pdev);



	ret = snd_soc_register_component(&pdev->dev, &davinci_mcasp_component,

	ret = devm_snd_soc_register_component(&pdev->dev,

					&davinci_mcasp_component,

					&davinci_mcasp_dai[pdata->op_mode], 1);



	if (ret != 0)

		goto err_release_clk;

		goto err;



	switch (mcasp->version) {

	case MCASP_VERSION_1:
@@ -1239,14 +1240,12 @@ static int davinci_mcasp_probe(struct platform_device *pdev) 


	if (ret) {

		dev_err(&pdev->dev, "register PCM failed: %d\n", ret);

		goto err_unregister_component;

		goto err;

	}



	return 0;



err_unregister_component:

	snd_soc_unregister_component(&pdev->dev);

err_release_clk:

err:

	pm_runtime_put_sync(&pdev->dev);

	pm_runtime_disable(&pdev->dev);

	return ret;
@@ -1254,8 +1253,6 @@ static int davinci_mcasp_probe(struct platform_device *pdev) 


static int davinci_mcasp_remove(struct platform_device *pdev)

{

	snd_soc_unregister_component(&pdev->dev);



	pm_runtime_put_sync(&pdev->dev);

	pm_runtime_disable(&pdev->dev);