leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

clk: sunxi: Improve divs_clk error handling and reporting

Browse Source 
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: Andre Przywara <andre.przywara@arm.com>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
This commit is contained in:
Andre Przywara 2016-02-16 10:46:08 +00:00 committed by Maxime Ripard
parent b26803ebfb
commit d331328da6
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/clk/sunxi/clk-sunxi.c
View File

@ -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 */ /* Set up factor clock that we will be dividing */
pclk = sunxi_factors_clk_setup(node, data->factors); pclk = sunxi_factors_clk_setup(node, data->factors);
if (!pclk)
return NULL;
parent = __clk_get_name(pclk); parent = __clk_get_name(pclk);
reg = of_iomap(node, 0); 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); clk_data = kmalloc(sizeof(struct clk_onecell_data), GFP_KERNEL);
if (!clk_data) if (!clk_data)
return NULL; goto out_unmap;
clks = kcalloc(ndivs, sizeof(*clks), GFP_KERNEL); clks = kcalloc(ndivs, sizeof(*clks), GFP_KERNEL);
if (!clks) if (!clks)
@ -1074,16 +1081,21 @@ static struct clk ** __init sunxi_divs_clk_setup(struct device_node *node,
/* Adjust to the real max */ /* Adjust to the real max */
clk_data->clk_num = i; 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; return clks;
free_gate: free_gate:
kfree(gate); kfree(gate);
free_clks: free_clks:
kfree(clks); kfree(clks);
free_clkdata: free_clkdata:
kfree(clk_data); kfree(clk_data);
out_unmap:
iounmap(reg);
return NULL; return NULL;
} }