diff options
author | Rajendra Nayak <rnayak@ti.com> | 2012-06-06 05:11:30 -0400 |
---|---|---|
committer | Mike Turquette <mturquette@linaro.org> | 2012-07-11 18:36:45 -0400 |
commit | 9ca1c5a4bf4105d6f2f2a46892495953dd3e2fec (patch) | |
tree | 8aae4e19948d34c24935ffc429a58a95e5e85379 /drivers/clk/clk.c | |
parent | f05259a6ffa40097b5565f25c3fcf833a9d3ecf5 (diff) |
clk: cache parent clocks only for muxes
caching parent clocks makes sense only when a clock has more
than one parent (mux clocks).
Avoid doing this for every other clock.
Signed-off-by: Rajendra Nayak <rnayak@ti.com>
[mturquette@linaro.org: removed extra parentheses]
Signed-off-by: Mike Turquette <mturquette@linaro.org>
Diffstat (limited to 'drivers/clk/clk.c')
-rw-r--r-- | drivers/clk/clk.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c index 9a1eb0cfa95f..46317cbc088f 100644 --- a/drivers/clk/clk.c +++ b/drivers/clk/clk.c | |||
@@ -1235,8 +1235,8 @@ int __clk_init(struct device *dev, struct clk *clk) | |||
1235 | * If clk->parents is not NULL we skip this entire block. This allows | 1235 | * If clk->parents is not NULL we skip this entire block. This allows |
1236 | * for clock drivers to statically initialize clk->parents. | 1236 | * for clock drivers to statically initialize clk->parents. |
1237 | */ | 1237 | */ |
1238 | if (clk->num_parents && !clk->parents) { | 1238 | if (clk->num_parents > 1 && !clk->parents) { |
1239 | clk->parents = kmalloc((sizeof(struct clk*) * clk->num_parents), | 1239 | clk->parents = kzalloc((sizeof(struct clk*) * clk->num_parents), |
1240 | GFP_KERNEL); | 1240 | GFP_KERNEL); |
1241 | /* | 1241 | /* |
1242 | * __clk_lookup returns NULL for parents that have not been | 1242 | * __clk_lookup returns NULL for parents that have not been |