]> git.karo-electronics.de Git - linux-beck.git/commitdiff
clk: ti: Update for of_clk_get_parent_count() returning unsigned int
authorStephen Boyd <sboyd@codeaurora.org>
Sat, 20 Feb 2016 01:49:23 +0000 (17:49 -0800)
committerStephen Boyd <sboyd@codeaurora.org>
Sat, 27 Feb 2016 00:01:32 +0000 (16:01 -0800)
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: Stephen Boyd <sboyd@codeaurora.org>
drivers/clk/ti/clockdomain.c
drivers/clk/ti/composite.c
drivers/clk/ti/dpll.c
drivers/clk/ti/mux.c

index b9bc3b8df659d853ba0a51a631f98d9a0f1c33c1..6cf9dd189a924e9d74472a260f7e816585b0d43b 100644 (file)
@@ -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);
 
index 43345c417815473f9160ef94ca599357fa3d6841..1cf70f452e1e660b594a5a92b99db21008abc28d 100644 (file)
@@ -234,14 +234,14 @@ cleanup:
 
 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;
        }
index f8306f1c30f1ce7d03530ec2e941bde5930e039b..3bc9959f71c39f78a8e28772fe4ae7548ca030bb 100644 (file)
@@ -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;
        }
index 618ded96ace36ba47a32e2b00bf9be053431fb0b..44777ab6fdeb3b6f8d0fcd5386790c506f39d300 100644 (file)
@@ -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);