Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 921bacfa authored by Stephen Boyd's avatar Stephen Boyd
Browse files

clk: ti: Update for of_clk_get_parent_count() returning unsigned int 



Change the types here to unsigned int instead of int and update
the checks for == 0 instead < 1 to be more explicit about what's
going on now that of_clk_get_parent_count() has changed return
types.

Cc: Tero Kristo <t-kristo@ti.com>
Signed-off-by: default avatarStephen Boyd <sboyd@codeaurora.org>
parent 36bf2811

drivers/clk/ti/clockdomain.c

+1 −1
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ static void __init of_ti_clockdomain_setup(struct device_node *node) 
	struct clk_hw *clk_hw;

	const char *clkdm_name = node->name;

	int i;

	int num_clks;

	unsigned int num_clks;



	num_clks = of_clk_get_parent_count(node);

drivers/clk/ti/composite.c

+4 −4
Original line number Diff line number Diff line
@@ -234,14 +234,14 @@ static void __init _register_composite(struct clk_hw *hw, 


static void __init of_ti_composite_clk_setup(struct device_node *node)

{

	int num_clks;

	unsigned int num_clks;

	int i;

	struct clk_hw_omap_comp *cclk;



	/* Number of component clocks to be put inside this clock */

	num_clks = of_clk_get_parent_count(node);



	if (num_clks < 1) {

	if (!num_clks) {

		pr_err("composite clk %s must have component(s)\n", node->name);

		return;

	}
@@ -271,13 +271,13 @@ CLK_OF_DECLARE(ti_composite_clock, "ti,composite-clock", 
int __init ti_clk_add_component(struct device_node *node, struct clk_hw *hw,

				int type)

{

	int num_parents;

	unsigned int num_parents;

	const char **parent_names;

	struct component_clk *clk;



	num_parents = of_clk_get_parent_count(node);



	if (num_parents < 1) {

	if (!num_parents) {

		pr_err("component-clock %s must have parent(s)\n", node->name);

		return -EINVAL;

	}

drivers/clk/ti/dpll.c

+1 −1
Original line number Diff line number Diff line
@@ -374,7 +374,7 @@ static void __init of_ti_dpll_setup(struct device_node *node, 
	init->ops = ops;



	init->num_parents = of_clk_get_parent_count(node);

	if (init->num_parents < 1) {

	if (!init->num_parents) {

		pr_err("%s must have parent(s)\n", node->name);

		goto cleanup;

	}

drivers/clk/ti/mux.c

+2 −2
Original line number Diff line number Diff line
@@ -178,7 +178,7 @@ static void of_mux_clk_setup(struct device_node *node) 
{

	struct clk *clk;

	void __iomem *reg;

	int num_parents;

	unsigned int num_parents;

	const char **parent_names;

	u8 clk_mux_flags = 0;

	u32 mask = 0;
@@ -261,7 +261,7 @@ struct clk_hw *ti_clk_build_component_mux(struct ti_clk_mux *setup) 
static void __init of_ti_composite_mux_clk_setup(struct device_node *node)

{

	struct clk_mux *mux;

	int num_parents;

	unsigned int num_parents;

	u32 val;



	mux = kzalloc(sizeof(*mux), GFP_KERNEL);