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

Commit 4313489c authored by Julia Lawall's avatar Julia Lawall Committed by Mark Brown
Browse files

ASoC: ux500: adjust devm usage 



The explicit call to devm_regulator_put in the probe and remove functions
does not seem to be necessary.  In particular, the functions
prcmu_qos_remove_requirement and ux500_msp_i2s_cleanup_msp in the remove
function seem to do nothing that can interfere with devm_regulator_put,
making it safe to allow devm_regulator_put to occur after the end of the
remove function.

Convert the calls to clk_get to devm_clk_get, and remove the corresponding
calls to clk_put in the probe and remove functions.

Replace various gotos by direct returns, and drop unneeded labels.

Signed-off-by: default avatarJulia Lawall <Julia.Lawall@lip6.fr>
Reviewed-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent bc0195aa

sound/soc/ux500/ux500_msp_dai.c

+10 −19
Original line number Diff line number Diff line
@@ -773,20 +773,22 @@ static int ux500_msp_drv_probe(struct platform_device *pdev) 
	}

	prcmu_qos_add_requirement(PRCMU_QOS_APE_OPP, (char *)pdev->name, 50);



	drvdata->pclk = clk_get(&pdev->dev, "apb_pclk");

	drvdata->pclk = devm_clk_get(&pdev->dev, "apb_pclk");

	if (IS_ERR(drvdata->pclk)) {

		ret = (int)PTR_ERR(drvdata->pclk);

		dev_err(&pdev->dev, "%s: ERROR: clk_get of pclk failed (%d)!\n",

		dev_err(&pdev->dev,

			"%s: ERROR: devm_clk_get of pclk failed (%d)!\n",

			__func__, ret);

		goto err_pclk;

		return ret;

	}



	drvdata->clk = clk_get(&pdev->dev, NULL);

	drvdata->clk = devm_clk_get(&pdev->dev, NULL);

	if (IS_ERR(drvdata->clk)) {

		ret = (int)PTR_ERR(drvdata->clk);

		dev_err(&pdev->dev, "%s: ERROR: clk_get failed (%d)!\n",

		dev_err(&pdev->dev,

			"%s: ERROR: devm_clk_get failed (%d)!\n",

			__func__, ret);

		goto err_clk;

		return ret;

	}



	ret = ux500_msp_i2s_init_msp(pdev, &drvdata->msp,
@@ -795,7 +797,7 @@ static int ux500_msp_drv_probe(struct platform_device *pdev) 
		dev_err(&pdev->dev,

			"%s: ERROR: Failed to init MSP-struct (%d)!",

			__func__, ret);

		goto err_init_msp;

		return ret;

	}

	dev_set_drvdata(&pdev->dev, drvdata);
@@ -804,7 +806,7 @@ static int ux500_msp_drv_probe(struct platform_device *pdev) 
	if (ret < 0) {

		dev_err(&pdev->dev, "Error: %s: Failed to register MSP%d!\n",

			__func__, drvdata->msp->id);

		goto err_init_msp;

		return ret;

	}



	ret = ux500_pcm_register_platform(pdev);
@@ -819,13 +821,6 @@ static int ux500_msp_drv_probe(struct platform_device *pdev) 


err_reg_plat:

	snd_soc_unregister_component(&pdev->dev);

err_init_msp:

	clk_put(drvdata->clk);

err_clk:

	clk_put(drvdata->pclk);

err_pclk:

	devm_regulator_put(drvdata->reg_vape);



	return ret;

}
@@ -837,12 +832,8 @@ static int ux500_msp_drv_remove(struct platform_device *pdev) 


	snd_soc_unregister_component(&pdev->dev);



	devm_regulator_put(drvdata->reg_vape);

	prcmu_qos_remove_requirement(PRCMU_QOS_APE_OPP, "ux500_msp_i2s");



	clk_put(drvdata->clk);

	clk_put(drvdata->pclk);



	ux500_msp_i2s_cleanup_msp(pdev, drvdata->msp);



	return 0;