Skip to content

Commit

Permalink
clk: socfpga: arria10: use of_clk_add_hw_provider and improve error h…
Browse files Browse the repository at this point in the history
…andling

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>
  • Loading branch information
Marco Pagani authored and Stephen Boyd committed Mar 21, 2023
1 parent 85f1b57 commit 6e83bd7
Showing 1 changed file with 19 additions and 7 deletions.
26 changes: 19 additions & 7 deletions drivers/clk/socfpga/clk-gate-a10.c
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ static struct clk_ops gateclk_ops = {
};

static void __init __socfpga_gate_init(struct device_node *node,
const struct clk_ops *ops)
const struct clk_ops *ops)
{
u32 clk_gate[2];
u32 div_reg[3];
Expand Down Expand Up @@ -94,13 +94,25 @@ static void __init __socfpga_gate_init(struct device_node *node,
socfpga_clk->hw.hw.init = &init;
hw_clk = &socfpga_clk->hw.hw;

if (clk_hw_register(NULL, hw_clk)) {
kfree(socfpga_clk);
return;
rc = clk_hw_register(NULL, hw_clk);
if (rc) {
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))
return;

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;

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)
Expand Down

0 comments on commit 6e83bd7

Please sign in to comment.