Merge branches 'pm-cpu', 'pm-cpuidle' and 'pm-domains'

[firefly-linux-kernel-4.4.55.git] / drivers / clk / at91 / clk-master.c

diff --git a/drivers/clk/at91/clk-master.c b/drivers/clk/at91/clk-master.c
index 5b3ded5205a29177dde69509bd72032f7fff61aa..620ea323356b62145c4f7ef7f1d19511c5832015 100644 (file)
--- a/drivers/clk/at91/clk-master.c
+++ b/drivers/clk/at91/clk-master.c
@@ -222,7 +222,6 @@ of_at91_clk_master_setup(struct device_node *np, struct at91_pmc *pmc,
 {
        struct clk *clk;
        int num_parents;
-       int i;
        unsigned int irq;
        const char *parent_names[MASTER_SOURCE_MAX];
        const char *name = np->name;
@@ -232,11 +231,7 @@ of_at91_clk_master_setup(struct device_node *np, struct at91_pmc *pmc,
        if (num_parents <= 0 || num_parents > MASTER_SOURCE_MAX)
                return;
 
-       for (i = 0; i < num_parents; ++i) {
-               parent_names[i] = of_clk_get_parent_name(np, i);
-               if (!parent_names[i])
-                       return;
-       }
+       of_clk_parent_fill(np, parent_names, num_parents);
 
        of_property_read_string(np, "clock-output-names", &name);