aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Boyd <sboyd@codeaurora.org>2016-02-19 20:29:17 -0500
committerStephen Boyd <sboyd@codeaurora.org>2016-02-26 19:01:32 -0500
commit8c1b1e54faed690261752afcba27c79ce4d3fa10 (patch)
tree075c60de1e8e0d9ce51833e3d9c64b34494483fb
parent929e7f3bc7b82fb3e72392dec6a1df334cff6313 (diff)
clk: at91: Remove impossible checks for of_clk_get_parent_count()
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>
-rw-r--r--drivers/clk/at91/clk-generated.c4
-rw-r--r--drivers/clk/at91/clk-main.c4
-rw-r--r--drivers/clk/at91/clk-master.c4
-rw-r--r--drivers/clk/at91/clk-programmable.c4
-rw-r--r--drivers/clk/at91/clk-slow.c6
-rw-r--r--drivers/clk/at91/clk-smd.c4
-rw-r--r--drivers/clk/at91/clk-usb.c4
7 files changed, 15 insertions, 15 deletions
diff --git a/drivers/clk/at91/clk-generated.c b/drivers/clk/at91/clk-generated.c
index abc80949e1dd..f82b16a65dee 100644
--- a/drivers/clk/at91/clk-generated.c
+++ b/drivers/clk/at91/clk-generated.c
@@ -268,13 +268,13 @@ void __init of_sama5d2_clk_generated_setup(struct device_node *np,
268 u32 id; 268 u32 id;
269 const char *name; 269 const char *name;
270 struct clk *clk; 270 struct clk *clk;
271 int num_parents; 271 unsigned int num_parents;
272 const char *parent_names[GENERATED_SOURCE_MAX]; 272 const char *parent_names[GENERATED_SOURCE_MAX];
273 struct device_node *gcknp; 273 struct device_node *gcknp;
274 struct clk_range range = CLK_RANGE(0, 0); 274 struct clk_range range = CLK_RANGE(0, 0);
275 275
276 num_parents = of_clk_get_parent_count(np); 276 num_parents = of_clk_get_parent_count(np);
277 if (num_parents <= 0 || num_parents > GENERATED_SOURCE_MAX) 277 if (num_parents == 0 || num_parents > GENERATED_SOURCE_MAX)
278 return; 278 return;
279 279
280 of_clk_parent_fill(np, parent_names, num_parents); 280 of_clk_parent_fill(np, parent_names, num_parents);
diff --git a/drivers/clk/at91/clk-main.c b/drivers/clk/at91/clk-main.c
index fd7247deabdc..b85f43529396 100644
--- a/drivers/clk/at91/clk-main.c
+++ b/drivers/clk/at91/clk-main.c
@@ -611,12 +611,12 @@ void __init of_at91sam9x5_clk_main_setup(struct device_node *np,
611{ 611{
612 struct clk *clk; 612 struct clk *clk;
613 const char *parent_names[2]; 613 const char *parent_names[2];
614 int num_parents; 614 unsigned int num_parents;
615 unsigned int irq; 615 unsigned int irq;
616 const char *name = np->name; 616 const char *name = np->name;
617 617
618 num_parents = of_clk_get_parent_count(np); 618 num_parents = of_clk_get_parent_count(np);
619 if (num_parents <= 0 || num_parents > 2) 619 if (num_parents == 0 || num_parents > 2)
620 return; 620 return;
621 621
622 of_clk_parent_fill(np, parent_names, num_parents); 622 of_clk_parent_fill(np, parent_names, num_parents);
diff --git a/drivers/clk/at91/clk-master.c b/drivers/clk/at91/clk-master.c
index 620ea323356b..016fe110b5ba 100644
--- a/drivers/clk/at91/clk-master.c
+++ b/drivers/clk/at91/clk-master.c
@@ -221,14 +221,14 @@ of_at91_clk_master_setup(struct device_node *np, struct at91_pmc *pmc,
221 const struct clk_master_layout *layout) 221 const struct clk_master_layout *layout)
222{ 222{
223 struct clk *clk; 223 struct clk *clk;
224 int num_parents; 224 unsigned int num_parents;
225 unsigned int irq; 225 unsigned int irq;
226 const char *parent_names[MASTER_SOURCE_MAX]; 226 const char *parent_names[MASTER_SOURCE_MAX];
227 const char *name = np->name; 227 const char *name = np->name;
228 struct clk_master_characteristics *characteristics; 228 struct clk_master_characteristics *characteristics;
229 229
230 num_parents = of_clk_get_parent_count(np); 230 num_parents = of_clk_get_parent_count(np);
231 if (num_parents <= 0 || num_parents > MASTER_SOURCE_MAX) 231 if (num_parents == 0 || num_parents > MASTER_SOURCE_MAX)
232 return; 232 return;
233 233
234 of_clk_parent_fill(np, parent_names, num_parents); 234 of_clk_parent_fill(np, parent_names, num_parents);
diff --git a/drivers/clk/at91/clk-programmable.c b/drivers/clk/at91/clk-programmable.c
index 14b270b85fec..b955fb81876f 100644
--- a/drivers/clk/at91/clk-programmable.c
+++ b/drivers/clk/at91/clk-programmable.c
@@ -232,13 +232,13 @@ of_at91_clk_prog_setup(struct device_node *np, struct at91_pmc *pmc,
232 int num; 232 int num;
233 u32 id; 233 u32 id;
234 struct clk *clk; 234 struct clk *clk;
235 int num_parents; 235 unsigned int num_parents;
236 const char *parent_names[PROG_SOURCE_MAX]; 236 const char *parent_names[PROG_SOURCE_MAX];
237 const char *name; 237 const char *name;
238 struct device_node *progclknp; 238 struct device_node *progclknp;
239 239
240 num_parents = of_clk_get_parent_count(np); 240 num_parents = of_clk_get_parent_count(np);
241 if (num_parents <= 0 || num_parents > PROG_SOURCE_MAX) 241 if (num_parents == 0 || num_parents > PROG_SOURCE_MAX)
242 return; 242 return;
243 243
244 of_clk_parent_fill(np, parent_names, num_parents); 244 of_clk_parent_fill(np, parent_names, num_parents);
diff --git a/drivers/clk/at91/clk-slow.c b/drivers/clk/at91/clk-slow.c
index 6f99a530ead6..67b304726d06 100644
--- a/drivers/clk/at91/clk-slow.c
+++ b/drivers/clk/at91/clk-slow.c
@@ -366,11 +366,11 @@ void __init of_at91sam9x5_clk_slow_setup(struct device_node *np,
366{ 366{
367 struct clk *clk; 367 struct clk *clk;
368 const char *parent_names[2]; 368 const char *parent_names[2];
369 int num_parents; 369 unsigned int num_parents;
370 const char *name = np->name; 370 const char *name = np->name;
371 371
372 num_parents = of_clk_get_parent_count(np); 372 num_parents = of_clk_get_parent_count(np);
373 if (num_parents <= 0 || num_parents > 2) 373 if (num_parents == 0 || num_parents > 2)
374 return; 374 return;
375 375
376 of_clk_parent_fill(np, parent_names, num_parents); 376 of_clk_parent_fill(np, parent_names, num_parents);
@@ -437,7 +437,7 @@ void __init of_at91sam9260_clk_slow_setup(struct device_node *np,
437{ 437{
438 struct clk *clk; 438 struct clk *clk;
439 const char *parent_names[2]; 439 const char *parent_names[2];
440 int num_parents; 440 unsigned int num_parents;
441 const char *name = np->name; 441 const char *name = np->name;
442 442
443 num_parents = of_clk_get_parent_count(np); 443 num_parents = of_clk_get_parent_count(np);
diff --git a/drivers/clk/at91/clk-smd.c b/drivers/clk/at91/clk-smd.c
index a7f8501cfa05..f525830ed5a1 100644
--- a/drivers/clk/at91/clk-smd.c
+++ b/drivers/clk/at91/clk-smd.c
@@ -145,12 +145,12 @@ void __init of_at91sam9x5_clk_smd_setup(struct device_node *np,
145 struct at91_pmc *pmc) 145 struct at91_pmc *pmc)
146{ 146{
147 struct clk *clk; 147 struct clk *clk;
148 int num_parents; 148 unsigned int num_parents;
149 const char *parent_names[SMD_SOURCE_MAX]; 149 const char *parent_names[SMD_SOURCE_MAX];
150 const char *name = np->name; 150 const char *name = np->name;
151 151
152 num_parents = of_clk_get_parent_count(np); 152 num_parents = of_clk_get_parent_count(np);
153 if (num_parents <= 0 || num_parents > SMD_SOURCE_MAX) 153 if (num_parents == 0 || num_parents > SMD_SOURCE_MAX)
154 return; 154 return;
155 155
156 of_clk_parent_fill(np, parent_names, num_parents); 156 of_clk_parent_fill(np, parent_names, num_parents);
diff --git a/drivers/clk/at91/clk-usb.c b/drivers/clk/at91/clk-usb.c
index 8ab8502778a2..be1c7f531837 100644
--- a/drivers/clk/at91/clk-usb.c
+++ b/drivers/clk/at91/clk-usb.c
@@ -373,12 +373,12 @@ void __init of_at91sam9x5_clk_usb_setup(struct device_node *np,
373 struct at91_pmc *pmc) 373 struct at91_pmc *pmc)
374{ 374{
375 struct clk *clk; 375 struct clk *clk;
376 int num_parents; 376 unsigned int num_parents;
377 const char *parent_names[USB_SOURCE_MAX]; 377 const char *parent_names[USB_SOURCE_MAX];
378 const char *name = np->name; 378 const char *name = np->name;
379 379
380 num_parents = of_clk_get_parent_count(np); 380 num_parents = of_clk_get_parent_count(np);
381 if (num_parents <= 0 || num_parents > USB_SOURCE_MAX) 381 if (num_parents == 0 || num_parents > USB_SOURCE_MAX)
382 return; 382 return;
383 383
384 of_clk_parent_fill(np, parent_names, num_parents); 384 of_clk_parent_fill(np, parent_names, num_parents);