Commit ffb009b2 authored by Tero Kristo's avatar Tero Kristo
Browse files

clk: ti: convert retry_init param to use void data type 



User data should be void type, as the core framework doesn't need to
know what is passed through.

Signed-off-by: default avatarTero Kristo <t-kristo@ti.com>
Acked-by: default avatarStephen Boyd <sboyd@codeaurora.org>
parent 3d8598fb

drivers/clk/ti/apll.c

+2 −1
Original line number Diff line number Diff line
@@ -133,9 +133,10 @@ static const struct clk_ops apll_ck_ops = { 
	.get_parent	= &dra7_init_apll_parent,

};



static void __init omap_clk_register_apll(struct clk_hw *hw,

static void __init omap_clk_register_apll(void *user,

					  struct device_node *node)

{

	struct clk_hw *hw = user;

	struct clk_hw_omap *clk_hw = to_clk_hw_omap(hw);

	struct dpll_data *ad = clk_hw->dpll_data;

	struct clk *clk;

drivers/clk/ti/clk.c

+6 −6
Original line number Diff line number Diff line
@@ -178,7 +178,7 @@ void __init ti_dt_clocks_register(struct ti_dt_clk oclks[]) 


struct clk_init_item {

	struct device_node *node;

	struct clk_hw *hw;

	void *user;

	ti_of_clk_init_cb_t func;

	struct list_head link;

};
@@ -188,13 +188,13 @@ static LIST_HEAD(retry_list); 
/**

 * ti_clk_retry_init - retries a failed clock init at later phase

 * @node: device not for the clock

 * @hw: partially initialized clk_hw struct for the clock

 * @user: user data pointer

 * @func: init function to be called for the clock

 *

 * Adds a failed clock init to the retry list. The retry list is parsed

 * once all the other clocks have been initialized.

 */

int __init ti_clk_retry_init(struct device_node *node, struct clk_hw *hw,

int __init ti_clk_retry_init(struct device_node *node, void *user,

			     ti_of_clk_init_cb_t func)

{

	struct clk_init_item *retry;
@@ -206,7 +206,7 @@ int __init ti_clk_retry_init(struct device_node *node, struct clk_hw *hw, 


	retry->node = node;

	retry->func = func;

	retry->hw = hw;

	retry->user = user;

	list_add(&retry->link, &retry_list);



	return 0;
@@ -328,7 +328,7 @@ void ti_dt_clk_init_retry_clks(void) 
	while (!list_empty(&retry_list) && retries) {

		list_for_each_entry_safe(retry, tmp, &retry_list, link) {

			pr_debug("retry-init: %s\n", retry->node->name);

			retry->func(retry->hw, retry->node);

			retry->func(retry->user, retry->node);

			list_del(&retry->link);

			kfree(retry);

		}

drivers/clk/ti/clock.h

+2 −2
Original line number Diff line number Diff line
@@ -235,7 +235,7 @@ extern const struct omap_clkctrl_data omap4_clkctrl_data[]; 
#define CLKF_HW_SUP	BIT(1)

#define CLKF_NO_IDLEST	BIT(2)



typedef void (*ti_of_clk_init_cb_t)(struct clk_hw *, struct device_node *);

typedef void (*ti_of_clk_init_cb_t)(void *, struct device_node *);



struct clk *ti_clk_register_gate(struct ti_clk *setup);

struct clk *ti_clk_register_interface(struct ti_clk *setup);
@@ -263,7 +263,7 @@ int ti_clk_register_legacy_clks(struct ti_clk_alias *clks); 
int ti_clk_get_reg_addr(struct device_node *node, int index,

			struct clk_omap_reg *reg);

void ti_dt_clocks_register(struct ti_dt_clk *oclks);

int ti_clk_retry_init(struct device_node *node, struct clk_hw *hw,

int ti_clk_retry_init(struct device_node *node, void *user,

		      ti_of_clk_init_cb_t func);

int ti_clk_add_component(struct device_node *node, struct clk_hw *hw, int type);

drivers/clk/ti/composite.c

+2 −1
Original line number Diff line number Diff line
@@ -161,9 +161,10 @@ struct clk *ti_clk_register_composite(struct ti_clk *setup) 
}

#endif



static void __init _register_composite(struct clk_hw *hw,

static void __init _register_composite(void *user,

				       struct device_node *node)

{

	struct clk_hw *hw = user;

	struct clk *clk;

	struct clk_hw_omap_comp *cclk = to_clk_hw_comp(hw);

	struct component_clk *comp;

drivers/clk/ti/dpll.c

+2 −1
Original line number Diff line number Diff line
@@ -152,9 +152,10 @@ static const struct clk_ops dpll_x2_ck_ops = { 
 * clk-bypass is missing), the clock is added to retry list and

 * the initialization is retried on later stage.

 */

static void __init _register_dpll(struct clk_hw *hw,

static void __init _register_dpll(void *user,

				  struct device_node *node)

{

	struct clk_hw *hw = user;

	struct clk_hw_omap *clk_hw = to_clk_hw_omap(hw);

	struct dpll_data *dd = clk_hw->dpll_data;

	struct clk *clk;