OSDN Git Service

clk: at91: Remove impossible checks for of_clk_get_parent_count()
authorStephen Boyd <sboyd@codeaurora.org>
Sat, 20 Feb 2016 01:29:17 +0000 (17:29 -0800)
committerStephen Boyd <sboyd@codeaurora.org>
Sat, 27 Feb 2016 00:01:32 +0000 (16:01 -0800)
These checks for < 0 are impossible now that
of_clk_get_parent_count() returns an unsigned int. Change the
checks for == 0 and update the type.

Cc: Boris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
drivers/clk/at91/clk-generated.c
drivers/clk/at91/clk-main.c
drivers/clk/at91/clk-master.c
drivers/clk/at91/clk-programmable.c
drivers/clk/at91/clk-slow.c
drivers/clk/at91/clk-smd.c
drivers/clk/at91/clk-usb.c

index abc8094..f82b16a 100644 (file)
@@ -268,13 +268,13 @@ void __init of_sama5d2_clk_generated_setup(struct device_node *np,
        u32 id;
        const char *name;
        struct clk *clk;
-       int num_parents;
+       unsigned int num_parents;
        const char *parent_names[GENERATED_SOURCE_MAX];
        struct device_node *gcknp;
        struct clk_range range = CLK_RANGE(0, 0);
 
        num_parents = of_clk_get_parent_count(np);
-       if (num_parents <= 0 || num_parents > GENERATED_SOURCE_MAX)
+       if (num_parents == 0 || num_parents > GENERATED_SOURCE_MAX)
                return;
 
        of_clk_parent_fill(np, parent_names, num_parents);
index fd7247d..b85f435 100644 (file)
@@ -611,12 +611,12 @@ void __init of_at91sam9x5_clk_main_setup(struct device_node *np,
 {
        struct clk *clk;
        const char *parent_names[2];
-       int num_parents;
+       unsigned int num_parents;
        unsigned int irq;
        const char *name = np->name;
 
        num_parents = of_clk_get_parent_count(np);
-       if (num_parents <= 0 || num_parents > 2)
+       if (num_parents == 0 || num_parents > 2)
                return;
 
        of_clk_parent_fill(np, parent_names, num_parents);
index 620ea32..016fe11 100644 (file)
@@ -221,14 +221,14 @@ of_at91_clk_master_setup(struct device_node *np, struct at91_pmc *pmc,
                         const struct clk_master_layout *layout)
 {
        struct clk *clk;
-       int num_parents;
+       unsigned int num_parents;
        unsigned int irq;
        const char *parent_names[MASTER_SOURCE_MAX];
        const char *name = np->name;
        struct clk_master_characteristics *characteristics;
 
        num_parents = of_clk_get_parent_count(np);
-       if (num_parents <= 0 || num_parents > MASTER_SOURCE_MAX)
+       if (num_parents == 0 || num_parents > MASTER_SOURCE_MAX)
                return;
 
        of_clk_parent_fill(np, parent_names, num_parents);
index 14b270b..b955fb8 100644 (file)
@@ -232,13 +232,13 @@ of_at91_clk_prog_setup(struct device_node *np, struct at91_pmc *pmc,
        int num;
        u32 id;
        struct clk *clk;
-       int num_parents;
+       unsigned int num_parents;
        const char *parent_names[PROG_SOURCE_MAX];
        const char *name;
        struct device_node *progclknp;
 
        num_parents = of_clk_get_parent_count(np);
-       if (num_parents <= 0 || num_parents > PROG_SOURCE_MAX)
+       if (num_parents == 0 || num_parents > PROG_SOURCE_MAX)
                return;
 
        of_clk_parent_fill(np, parent_names, num_parents);
index 6f99a53..67b3047 100644 (file)
@@ -366,11 +366,11 @@ void __init of_at91sam9x5_clk_slow_setup(struct device_node *np,
 {
        struct clk *clk;
        const char *parent_names[2];
-       int num_parents;
+       unsigned int num_parents;
        const char *name = np->name;
 
        num_parents = of_clk_get_parent_count(np);
-       if (num_parents <= 0 || num_parents > 2)
+       if (num_parents == 0 || num_parents > 2)
                return;
 
        of_clk_parent_fill(np, parent_names, num_parents);
@@ -437,7 +437,7 @@ void __init of_at91sam9260_clk_slow_setup(struct device_node *np,
 {
        struct clk *clk;
        const char *parent_names[2];
-       int num_parents;
+       unsigned int num_parents;
        const char *name = np->name;
 
        num_parents = of_clk_get_parent_count(np);
index a7f8501..f525830 100644 (file)
@@ -145,12 +145,12 @@ void __init of_at91sam9x5_clk_smd_setup(struct device_node *np,
                                        struct at91_pmc *pmc)
 {
        struct clk *clk;
-       int num_parents;
+       unsigned int num_parents;
        const char *parent_names[SMD_SOURCE_MAX];
        const char *name = np->name;
 
        num_parents = of_clk_get_parent_count(np);
-       if (num_parents <= 0 || num_parents > SMD_SOURCE_MAX)
+       if (num_parents == 0 || num_parents > SMD_SOURCE_MAX)
                return;
 
        of_clk_parent_fill(np, parent_names, num_parents);
index 8ab8502..be1c7f5 100644 (file)
@@ -373,12 +373,12 @@ void __init of_at91sam9x5_clk_usb_setup(struct device_node *np,
                                        struct at91_pmc *pmc)
 {
        struct clk *clk;
-       int num_parents;
+       unsigned int num_parents;
        const char *parent_names[USB_SOURCE_MAX];
        const char *name = np->name;
 
        num_parents = of_clk_get_parent_count(np);
-       if (num_parents <= 0 || num_parents > USB_SOURCE_MAX)
+       if (num_parents == 0 || num_parents > USB_SOURCE_MAX)
                return;
 
        of_clk_parent_fill(np, parent_names, num_parents);