Commit 878b02d5 authored by Yuxing Liu's avatar Yuxing Liu Committed by Abel Vesa
Browse files

clk: imx: clk-imx8mp: improve error handling in imx8mp_clocks_probe() 



Replace of_iomap() and kzalloc() with devm_of_iomap() and devm_kzalloc()
which can automatically release the related memory when the device
or driver is removed or unloaded to avoid potential memory leak.

In this case, iounmap(anatop_base) in line 427,433 are removed
as manual release is not required.

Besides, 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.

Fixes: 9c140d99 ("clk: imx: Add support for i.MX8MP clock driver")
Signed-off-by: default avatarYuxing Liu <lyx2022@hust.edu.cn>
Reviewed-by: default avatarDongliang Mu <dzm91@hust.edu.cn>
Reviewed-by: default avatarAbel Vesa <abel.vesa@linaro.org>
Link: https://lore.kernel.org/r/20230503070607.2462-1-lyx2022@hust.edu.cn


Signed-off-by: default avatarAbel Vesa <abel.vesa@linaro.org>
parent e02ba11b

drivers/clk/imx/clk-imx8mp.c

+13 −11
Original line number Diff line number Diff line
@@ -414,25 +414,22 @@ 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 = of_iomap(np, 0);

	anatop_base = devm_of_iomap(dev, np, 0, NULL);

	of_node_put(np);

	if (WARN_ON(!anatop_base))

		return -ENOMEM;

	if (WARN_ON(IS_ERR(anatop_base)))

		return PTR_ERR(anatop_base);



	np = dev->of_node;

	ccm_base = devm_platform_ioremap_resource(pdev, 0);

	if (WARN_ON(IS_ERR(ccm_base))) {

		iounmap(anatop_base);

	if (WARN_ON(IS_ERR(ccm_base)))

		return PTR_ERR(ccm_base);

	}



	clk_hw_data = kzalloc(struct_size(clk_hw_data, hws, IMX8MP_CLK_END), GFP_KERNEL);

	if (WARN_ON(!clk_hw_data)) {

		iounmap(anatop_base);

	clk_hw_data = devm_kzalloc(dev, struct_size(clk_hw_data, hws, IMX8MP_CLK_END), GFP_KERNEL);

	if (WARN_ON(!clk_hw_data))

		return -ENOMEM;

	}



	clk_hw_data->num = IMX8MP_CLK_END;

	hws = clk_hw_data->hws;
@@ -722,7 +719,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();