clk: walk the orphan clock list more simply

This loop can be much simpler. If a new parent is available for
orphan clocks, __clk_init_parent(orphan) can detect it.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: Vladimir Zapolskiy <vz@mleia.com>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>

diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c
index 5a1507498e0527e2078d0cc0c8e822dca43371e0..03820467fbba86bce711873f847268030cb93928 100644 (file)
--- a/drivers/clk/clk.c
+++ b/drivers/clk/clk.c
@@ -2422,24 +2422,15 @@ static int __clk_core_init(struct clk_core *core)
        core->rate = core->req_rate = rate;
 
        /*
-        * walk the list of orphan clocks and reparent any that are children of
-        * this clock
+        * walk the list of orphan clocks and reparent any that newly finds a
+        * parent.
         */
        hlist_for_each_entry_safe(orphan, tmp2, &clk_orphan_list, child_node) {
-               if (orphan->num_parents && orphan->ops->get_parent) {
-                       i = orphan->ops->get_parent(orphan->hw);
-                       if (i >= 0 && i < orphan->num_parents &&
-                           !strcmp(core->name, orphan->parent_names[i]))
-                               clk_core_reparent(orphan, core);
-                       continue;
-               }
+               struct clk_core *parent = __clk_init_parent(orphan);
 
-               for (i = 0; i < orphan->num_parents; i++)
-                       if (!strcmp(core->name, orphan->parent_names[i])) {
-                               clk_core_reparent(orphan, core);
-                               break;
-                       }
-        }
+               if (parent)
+                       clk_core_reparent(orphan, parent);
+       }
 
        /*
         * optional platform-specific magic