diff options
author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2015-12-28 05:22:58 -0500 |
---|---|---|
committer | Stephen Boyd <sboyd@codeaurora.org> | 2016-02-01 20:01:39 -0500 |
commit | 027f942ce44131bc3a11aaae6dbb227f461845b6 (patch) | |
tree | 9d24aed5fea817a4d90a66edcc7e35ca53383f99 /drivers/clk | |
parent | be45ebf25fc8866675f4822c74c9d0eb3dd96103 (diff) |
clk: remove unnecessary !core->parents conditional
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>
Diffstat (limited to 'drivers/clk')
-rw-r--r-- | drivers/clk/clk.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c index e7701d6029b3..735828d55c00 100644 --- a/drivers/clk/clk.c +++ b/drivers/clk/clk.c | |||
@@ -2366,11 +2366,8 @@ static int __clk_core_init(struct clk_core *core) | |||
2366 | * in to clk_init during early boot; thus any access to core->parents[] | 2366 | * in to clk_init during early boot; thus any access to core->parents[] |
2367 | * must always check for a NULL pointer and try to populate it if | 2367 | * must always check for a NULL pointer and try to populate it if |
2368 | * necessary. | 2368 | * necessary. |
2369 | * | ||
2370 | * If core->parents is not NULL we skip this entire block. This allows | ||
2371 | * for clock drivers to statically initialize core->parents. | ||
2372 | */ | 2369 | */ |
2373 | if (core->num_parents > 1 && !core->parents) { | 2370 | if (core->num_parents > 1) { |
2374 | core->parents = kcalloc(core->num_parents, sizeof(struct clk *), | 2371 | core->parents = kcalloc(core->num_parents, sizeof(struct clk *), |
2375 | GFP_KERNEL); | 2372 | GFP_KERNEL); |
2376 | /* | 2373 | /* |