[PATCH] PM / devfreq: mtk-cci: refactor error handling of probe and remove
AngeloGioacchino Del Regno
angelogioacchino.delregno at collabora.com
Wed May 3 04:40:56 PDT 2023
Il 03/05/23 11:27, jia-wei.chang ha scritto:
> From: Jia-Wei Chang <jia-wei.chang at mediatek.com>
>
> To refactor the regulator/clk handlers so it can follow the way of "Free
> the Last Thing Style".
>
> Signed-off-by: Jia-Wei Chang <jia-wei.chang at mediatek.com>
> Fixes: 86d231b1db1b ("PM / devfreq: mediatek: Introduce MediaTek CCI devfreq driver")
> ---
> drivers/devfreq/mtk-cci-devfreq.c | 47 ++++++++++++++++++-------------
> 1 file changed, 28 insertions(+), 19 deletions(-)
>
> diff --git a/drivers/devfreq/mtk-cci-devfreq.c b/drivers/devfreq/mtk-cci-devfreq.c
> index e5458ada5197..d2f743774147 100644
> --- a/drivers/devfreq/mtk-cci-devfreq.c
> +++ b/drivers/devfreq/mtk-cci-devfreq.c
> @@ -294,14 +294,14 @@ static int mtk_ccifreq_probe(struct platform_device *pdev)
> if (IS_ERR(drv->sram_reg)) {
> ret = PTR_ERR(drv->sram_reg);
> if (ret == -EPROBE_DEFER)
> - goto out_free_resources;
> + goto out_disable_proc_reg;
>
> drv->sram_reg = NULL;
> } else {
> ret = regulator_enable(drv->sram_reg);
> if (ret) {
> dev_err(dev, "failed to enable sram regulator\n");
> - goto out_free_resources;
> + goto out_disable_proc_reg;
> }
> }
>
> @@ -316,12 +316,16 @@ static int mtk_ccifreq_probe(struct platform_device *pdev)
>
> ret = clk_prepare_enable(drv->cci_clk);
> if (ret)
> - goto out_free_resources;
> + goto out_disable_sram_reg;
> +
> + ret = clk_prepare_enable(drv->inter_clk);
Adding a clk_prepare_enable() call for a clock must be done in a separate commit.
Besides, there shouldn't be any need to do that, as when you call clk_set_parent()
(done in mtk_ccifreq_target()) on a clock that has flag CLK_OPS_PARENT_ENABLE, the
clk core will automatically call clk_core_prepare_enable() on the new parent.
If you're facing a bug for which the parent is not getting enabled, the solution
is to add CLK_OPS_PARENT_ENABLE to the interested clock.
Regards,
Angelo
More information about the linux-arm-kernel
mailing list