diff options
author | Geert Uytterhoeven <geert+renesas@glider.be> | 2015-05-29 05:25:45 -0400 |
---|---|---|
committer | Stephen Boyd <sboyd@codeaurora.org> | 2015-06-04 16:51:23 -0400 |
commit | 51a43be9fa9016e02ef9c4214470c919223d138c (patch) | |
tree | c29f16efd9e646b917e59a900e55c2980489173b | |
parent | 17bfa3f7b3cd07e92b41ce7b5bea2dd8c8e2a8c3 (diff) |
clk: at91: Use of_clk_get_parent_count() instead of open coding
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
-rw-r--r-- | drivers/clk/at91/clk-main.c | 2 | ||||
-rw-r--r-- | drivers/clk/at91/clk-master.c | 2 | ||||
-rw-r--r-- | drivers/clk/at91/clk-programmable.c | 2 | ||||
-rw-r--r-- | drivers/clk/at91/clk-slow.c | 4 | ||||
-rw-r--r-- | drivers/clk/at91/clk-smd.c | 2 | ||||
-rw-r--r-- | drivers/clk/at91/clk-usb.c | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/drivers/clk/at91/clk-main.c b/drivers/clk/at91/clk-main.c index 59fa3cc96c9e..c2400456a044 100644 --- a/drivers/clk/at91/clk-main.c +++ b/drivers/clk/at91/clk-main.c | |||
@@ -614,7 +614,7 @@ void __init of_at91sam9x5_clk_main_setup(struct device_node *np, | |||
614 | const char *name = np->name; | 614 | const char *name = np->name; |
615 | int i; | 615 | int i; |
616 | 616 | ||
617 | num_parents = of_count_phandle_with_args(np, "clocks", "#clock-cells"); | 617 | num_parents = of_clk_get_parent_count(np); |
618 | if (num_parents <= 0 || num_parents > 2) | 618 | if (num_parents <= 0 || num_parents > 2) |
619 | return; | 619 | return; |
620 | 620 | ||
diff --git a/drivers/clk/at91/clk-master.c b/drivers/clk/at91/clk-master.c index c1af80bcdf20..f98eafe9b12d 100644 --- a/drivers/clk/at91/clk-master.c +++ b/drivers/clk/at91/clk-master.c | |||
@@ -224,7 +224,7 @@ of_at91_clk_master_setup(struct device_node *np, struct at91_pmc *pmc, | |||
224 | const char *name = np->name; | 224 | const char *name = np->name; |
225 | struct clk_master_characteristics *characteristics; | 225 | struct clk_master_characteristics *characteristics; |
226 | 226 | ||
227 | num_parents = of_count_phandle_with_args(np, "clocks", "#clock-cells"); | 227 | num_parents = of_clk_get_parent_count(np); |
228 | if (num_parents <= 0 || num_parents > MASTER_SOURCE_MAX) | 228 | if (num_parents <= 0 || num_parents > MASTER_SOURCE_MAX) |
229 | return; | 229 | return; |
230 | 230 | ||
diff --git a/drivers/clk/at91/clk-programmable.c b/drivers/clk/at91/clk-programmable.c index 86c8a073dcc3..8c86c0f7847a 100644 --- a/drivers/clk/at91/clk-programmable.c +++ b/drivers/clk/at91/clk-programmable.c | |||
@@ -237,7 +237,7 @@ of_at91_clk_prog_setup(struct device_node *np, struct at91_pmc *pmc, | |||
237 | const char *name; | 237 | const char *name; |
238 | struct device_node *progclknp; | 238 | struct device_node *progclknp; |
239 | 239 | ||
240 | num_parents = of_count_phandle_with_args(np, "clocks", "#clock-cells"); | 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 | ||
diff --git a/drivers/clk/at91/clk-slow.c b/drivers/clk/at91/clk-slow.c index 2f13bd5246b5..98a84a865fe1 100644 --- a/drivers/clk/at91/clk-slow.c +++ b/drivers/clk/at91/clk-slow.c | |||
@@ -373,7 +373,7 @@ void __init of_at91sam9x5_clk_slow_setup(struct device_node *np, | |||
373 | const char *name = np->name; | 373 | const char *name = np->name; |
374 | int i; | 374 | int i; |
375 | 375 | ||
376 | num_parents = of_count_phandle_with_args(np, "clocks", "#clock-cells"); | 376 | num_parents = of_clk_get_parent_count(np); |
377 | if (num_parents <= 0 || num_parents > 2) | 377 | if (num_parents <= 0 || num_parents > 2) |
378 | return; | 378 | return; |
379 | 379 | ||
@@ -451,7 +451,7 @@ void __init of_at91sam9260_clk_slow_setup(struct device_node *np, | |||
451 | const char *name = np->name; | 451 | const char *name = np->name; |
452 | int i; | 452 | int i; |
453 | 453 | ||
454 | num_parents = of_count_phandle_with_args(np, "clocks", "#clock-cells"); | 454 | num_parents = of_clk_get_parent_count(np); |
455 | if (num_parents != 2) | 455 | if (num_parents != 2) |
456 | return; | 456 | return; |
457 | 457 | ||
diff --git a/drivers/clk/at91/clk-smd.c b/drivers/clk/at91/clk-smd.c index 144d47ecfe63..3817ea865ca2 100644 --- a/drivers/clk/at91/clk-smd.c +++ b/drivers/clk/at91/clk-smd.c | |||
@@ -150,7 +150,7 @@ void __init of_at91sam9x5_clk_smd_setup(struct device_node *np, | |||
150 | const char *parent_names[SMD_SOURCE_MAX]; | 150 | const char *parent_names[SMD_SOURCE_MAX]; |
151 | const char *name = np->name; | 151 | const char *name = np->name; |
152 | 152 | ||
153 | num_parents = of_count_phandle_with_args(np, "clocks", "#clock-cells"); | 153 | num_parents = of_clk_get_parent_count(np); |
154 | if (num_parents <= 0 || num_parents > SMD_SOURCE_MAX) | 154 | if (num_parents <= 0 || num_parents > SMD_SOURCE_MAX) |
155 | return; | 155 | return; |
156 | 156 | ||
diff --git a/drivers/clk/at91/clk-usb.c b/drivers/clk/at91/clk-usb.c index 0b7c3e8840ba..b0cbd2b1ff59 100644 --- a/drivers/clk/at91/clk-usb.c +++ b/drivers/clk/at91/clk-usb.c | |||
@@ -378,7 +378,7 @@ void __init of_at91sam9x5_clk_usb_setup(struct device_node *np, | |||
378 | const char *parent_names[USB_SOURCE_MAX]; | 378 | const char *parent_names[USB_SOURCE_MAX]; |
379 | const char *name = np->name; | 379 | const char *name = np->name; |
380 | 380 | ||
381 | num_parents = of_count_phandle_with_args(np, "clocks", "#clock-cells"); | 381 | num_parents = of_clk_get_parent_count(np); |
382 | if (num_parents <= 0 || num_parents > USB_SOURCE_MAX) | 382 | if (num_parents <= 0 || num_parents > USB_SOURCE_MAX) |
383 | return; | 383 | return; |
384 | 384 | ||