[PATCH 2/2] clk: imx: clk-imx8mp: add error handling of of_clk_add_hw_provider

[PATCH 2/2] clk: imx: clk-imx8mp: add error handling of of_clk_add_hw_provider

[Yuxing Liu]

Referring to clk-imx8mq.c, check the return code of of_clk_add_hw_provider,
if it returns negtive, print error info and unregister hws,
which makes the program more robust.

Signed-off-by: Yuxing Liu <lyx2022@hust.edu.cn>
Reviewed-by: Dongliang Mu <dzm91@hust.edu.cn>
---
This patch is untested on real device.
---
 drivers/clk/imx/clk-imx8mp.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/drivers/clk/imx/clk-imx8mp.c b/drivers/clk/imx/clk-imx8mp.c
index 353d58b665f9..de7d2d2176be 100644
--- a/drivers/clk/imx/clk-imx8mp.c
+++ b/drivers/clk/imx/clk-imx8mp.c
@@ -414,6 +414,7 @@ static int imx8mp_clocks_probe(struct platform_device *pdev)
 	struct device *dev = &pdev->dev;
 	struct device_node *np;
 	void __iomem *anatop_base, *ccm_base;
+	int err;
 
 	np = of_find_compatible_node(NULL, NULL, "fsl,imx8mp-anatop");
 	anatop_base = devm_of_iomap(dev, np, 0, NULL);
@@ -717,7 +718,12 @@ static int imx8mp_clocks_probe(struct platform_device *pdev)
 
 	imx_check_clk_hws(hws, IMX8MP_CLK_END);
 
-	of_clk_add_hw_provider(np, of_clk_hw_onecell_get, clk_hw_data);
+	err = of_clk_add_hw_provider(np, of_clk_hw_onecell_get, clk_hw_data);
+	if (err < 0) {
+		dev_err(dev, "failed to register hws for i.MX8MP\n");
+		imx_unregister_hw_clocks(hws, IMX8MP_CLK_END);
+		return err;
+	}
 
 	imx_register_uart_clocks();
 
-- 
2.34.1

Re: [PATCH 2/2] clk: imx: clk-imx8mp: add error handling of of_clk_add_hw_provider

[Peng Fan]

On 4/24/2023 5:24 PM, Yuxing Liu wrote:
> Referring to clk-imx8mq.c, check the return code of of_clk_add_hw_provider,
> if it returns negtive, print error info and unregister hws,
> which makes the program more robust.

Patch 1 & 2 merged into 1 patch, no need seperate.

Regards,
Peng.

> 
> Signed-off-by: Yuxing Liu <lyx2022@hust.edu.cn>
> Reviewed-by: Dongliang Mu <dzm91@hust.edu.cn>
> ---
> This patch is untested on real device.
> ---
>   drivers/clk/imx/clk-imx8mp.c | 8 +++++++-
>   1 file changed, 7 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/clk/imx/clk-imx8mp.c b/drivers/clk/imx/clk-imx8mp.c
> index 353d58b665f9..de7d2d2176be 100644
> --- a/drivers/clk/imx/clk-imx8mp.c
> +++ b/drivers/clk/imx/clk-imx8mp.c
> @@ -414,6 +414,7 @@ static int imx8mp_clocks_probe(struct platform_device *pdev)
>   	struct device *dev = &pdev->dev;
>   	struct device_node *np;
>   	void __iomem *anatop_base, *ccm_base;
> +	int err;
>   
>   	np = of_find_compatible_node(NULL, NULL, "fsl,imx8mp-anatop");
>   	anatop_base = devm_of_iomap(dev, np, 0, NULL);
> @@ -717,7 +718,12 @@ static int imx8mp_clocks_probe(struct platform_device *pdev)
>   
>   	imx_check_clk_hws(hws, IMX8MP_CLK_END);
>   
> -	of_clk_add_hw_provider(np, of_clk_hw_onecell_get, clk_hw_data);
> +	err = of_clk_add_hw_provider(np, of_clk_hw_onecell_get, clk_hw_data);
> +	if (err < 0) {
> +		dev_err(dev, "failed to register hws for i.MX8MP\n");
> +		imx_unregister_hw_clocks(hws, IMX8MP_CLK_END);
> +		return err;
> +	}
>   
>   	imx_register_uart_clocks();
>