mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-01 22:54:01 +00:00
clk: socfpga: arria10: use of_clk_add_hw_provider and improve error handling
The function of_clk_add_provider() has been deprecated, so use its suggested replacement of_clk_add_hw_provider() instead. Since of_clk_add_hw_provider() can fail, like of_clk_add_provider(), check its return value and do the error handling. The indentation of the init function parameters has been aligned to match open parenthesis as suggested by checkpatch. Signed-off-by: Marco Pagani <marpagan@redhat.com> Link: https://lore.kernel.org/r/20221209152913.1335068-5-marpagan@redhat.com Signed-off-by: Stephen Boyd <sboyd@kernel.org>
This commit is contained in:
parent
85f1b57405
commit
6e83bd71c0
1 changed files with 19 additions and 7 deletions
|
@ -94,13 +94,25 @@ static void __init __socfpga_gate_init(struct device_node *node,
|
||||||
socfpga_clk->hw.hw.init = &init;
|
socfpga_clk->hw.hw.init = &init;
|
||||||
hw_clk = &socfpga_clk->hw.hw;
|
hw_clk = &socfpga_clk->hw.hw;
|
||||||
|
|
||||||
if (clk_hw_register(NULL, hw_clk)) {
|
rc = clk_hw_register(NULL, hw_clk);
|
||||||
kfree(socfpga_clk);
|
if (rc) {
|
||||||
return;
|
pr_err("Could not register clock:%s\n", clk_name);
|
||||||
|
goto err_clk_hw_register;
|
||||||
}
|
}
|
||||||
rc = of_clk_add_provider(node, of_clk_src_simple_get, hw_clk);
|
|
||||||
if (WARN_ON(rc))
|
rc = of_clk_add_hw_provider(node, of_clk_hw_simple_get, hw_clk);
|
||||||
|
if (rc) {
|
||||||
|
pr_err("Could not register clock provider for node:%s\n",
|
||||||
|
clk_name);
|
||||||
|
goto err_of_clk_add_hw_provider;
|
||||||
|
}
|
||||||
|
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
err_of_clk_add_hw_provider:
|
||||||
|
clk_hw_unregister(hw_clk);
|
||||||
|
err_clk_hw_register:
|
||||||
|
kfree(socfpga_clk);
|
||||||
}
|
}
|
||||||
|
|
||||||
void __init socfpga_a10_gate_init(struct device_node *node)
|
void __init socfpga_a10_gate_init(struct device_node *node)
|
||||||
|
|
Loading…
Reference in a new issue