OSDN Git Service

clk: remove unnecessary !core->parents conditional
authorMasahiro Yamada <yamada.masahiro@socionext.com>
Mon, 28 Dec 2015 10:22:58 +0000 (19:22 +0900)
committerStephen Boyd <sboyd@codeaurora.org>
Tue, 2 Feb 2016 01:01:39 +0000 (17:01 -0800)
This if-block has been here since the introduction of the common
clock framework.  Now no clock drivers are statically initialized.
core->parent is always NULL at this point.  Drop the redundant
check and the confusing comment.

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

index e7701d6..735828d 100644 (file)
@@ -2366,11 +2366,8 @@ static int __clk_core_init(struct clk_core *core)
         * in to clk_init during early boot; thus any access to core->parents[]
         * must always check for a NULL pointer and try to populate it if
         * necessary.
-        *
-        * If core->parents is not NULL we skip this entire block.  This allows
-        * for clock drivers to statically initialize core->parents.
         */
-       if (core->num_parents > 1 && !core->parents) {
+       if (core->num_parents > 1) {
                core->parents = kcalloc(core->num_parents, sizeof(struct clk *),
                                        GFP_KERNEL);
                /*