Skip to content

Commit

Permalink
clk: change sizeof(struct clk *) to sizeof(*core->parents)
Browse files Browse the repository at this point in the history
Now, the clock parent is not "struct clk *", but "struct clk_core *".
Of course, the size of a pointer is always same, but strictly speaking,
sizeof(struct clk *) should be sizeof(struct clk_core *) here.

This mismatch happened when we split the structure into struct clk
and struct clk_core.  For the potential possibility of future renaming,
sizeof(*core->parents) would be better.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: Vladimir Zapolskiy <vz@mleia.com>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
  • Loading branch information
Masahiro Yamada authored and Stephen Boyd committed Feb 2, 2016
1 parent 027f942 commit 3a6e845
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions drivers/clk/clk.c
Original file line number Diff line number Diff line change
Expand Up @@ -1069,7 +1069,7 @@ static int clk_fetch_parent_index(struct clk_core *core,

if (!core->parents) {
core->parents = kcalloc(core->num_parents,
sizeof(struct clk *), GFP_KERNEL);
sizeof(*core->parents), GFP_KERNEL);
if (!core->parents)
return -ENOMEM;
}
Expand Down Expand Up @@ -1720,7 +1720,7 @@ static struct clk_core *__clk_init_parent(struct clk_core *core)

if (!core->parents)
core->parents =
kcalloc(core->num_parents, sizeof(struct clk *),
kcalloc(core->num_parents, sizeof(*core->parents),
GFP_KERNEL);

ret = clk_core_get_parent_by_index(core, index);
Expand Down Expand Up @@ -2368,8 +2368,8 @@ static int __clk_core_init(struct clk_core *core)
* necessary.
*/
if (core->num_parents > 1) {
core->parents = kcalloc(core->num_parents, sizeof(struct clk *),
GFP_KERNEL);
core->parents = kcalloc(core->num_parents,
sizeof(*core->parents), GFP_KERNEL);
/*
* clk_core_lookup returns NULL for parents that have not been
* clk_init'd; thus any access to clk->parents[] must check
Expand Down

0 comments on commit 3a6e845

Please sign in to comment.