Commit da939f6d authored by Marco Pagani's avatar Marco Pagani Committed by Stephen Boyd
Browse files

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, and the __init
macro moved before the function name, as specified in init.h.

Signed-off-by: default avatarMarco Pagani <marpagan@redhat.com>
Link: https://lore.kernel.org/r/20221209152913.1335068-3-marpagan@redhat.com


Signed-off-by: default avatarStephen Boyd <sboyd@kernel.org>
parent 48801895

drivers/clk/socfpga/clk-periph-a10.c

+13 −9
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ static const struct clk_ops periclk_ops = { 
	.get_parent = clk_periclk_get_parent,

};



static __init void __socfpga_periph_init(struct device_node *node,

static void __init __socfpga_periph_init(struct device_node *node,

					 const struct clk_ops *ops)

{

	u32 reg;
@@ -106,21 +106,25 @@ static __init void __socfpga_periph_init(struct device_node *node, 


	hw_clk = &periph_clk->hw.hw;



	if (clk_hw_register(NULL, hw_clk)) {

		kfree(periph_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 (rc < 0) {



	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_clk;

		goto err_of_clk_add_hw_provider;

	}



	return;



err_clk:

err_of_clk_add_hw_provider:

	clk_hw_unregister(hw_clk);

err_clk_hw_register:

	kfree(periph_clk);

}



void __init socfpga_a10_periph_init(struct device_node *node)