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

Commit d331328d authored by Andre Przywara's avatar Andre Przywara Committed by Maxime Ripard
Browse files

clk: sunxi: Improve divs_clk error handling and reporting 



We catch errors in the base clock registration, failure to ioremap
and failures in the final of_clk_add_provider() call.
Also we unmap the registers when we need to rollback.

Signed-off-by: default avatarAndre Przywara <andre.przywara@arm.com>
Signed-off-by: default avatarMaxime Ripard <maxime.ripard@free-electrons.com>
parent b26803eb

drivers/clk/sunxi/clk-sunxi.c

+15 −3
Original line number Diff line number Diff line
@@ -985,13 +985,20 @@ static struct clk ** __init sunxi_divs_clk_setup(struct device_node *node, 


	/* Set up factor clock that we will be dividing */

	pclk = sunxi_factors_clk_setup(node, data->factors);

	if (!pclk)

		return NULL;

	parent = __clk_get_name(pclk);



	reg = of_iomap(node, 0);

	if (!reg) {

		pr_err("Could not map registers for divs-clk: %s\n",

		       of_node_full_name(node));

		return NULL;

	}



	clk_data = kmalloc(sizeof(struct clk_onecell_data), GFP_KERNEL);

	if (!clk_data)

		return NULL;

		goto out_unmap;



	clks = kcalloc(ndivs, sizeof(*clks), GFP_KERNEL);

	if (!clks)
@@ -1074,16 +1081,21 @@ static struct clk ** __init sunxi_divs_clk_setup(struct device_node *node, 
	/* Adjust to the real max */

	clk_data->clk_num = i;



	of_clk_add_provider(node, of_clk_src_onecell_get, clk_data);

	if (of_clk_add_provider(node, of_clk_src_onecell_get, clk_data)) {

		pr_err("%s: failed to add clock provider for %s\n",

		       __func__, clk_name);

		goto free_gate;

	}



	return clks;



free_gate:

	kfree(gate);

free_clks:

	kfree(clks);

free_clkdata:

	kfree(clk_data);

out_unmap:

	iounmap(reg);

	return NULL;

}