summaryrefslogtreecommitdiff
path: root/drivers/clk/clk.c
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.masahiro@socionext.com>2015-12-28 19:22:58 +0900
committerStephen Boyd <sboyd@codeaurora.org>2016-02-01 17:01:39 -0800
commit027f942ce44131bc3a11aaae6dbb227f461845b6 (patch)
tree9d24aed5fea817a4d90a66edcc7e35ca53383f99 /drivers/clk/clk.c
parentbe45ebf25fc8866675f4822c74c9d0eb3dd96103 (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/clk.c')
-rw-r--r--drivers/clk/clk.c5
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)
* 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);
/*