From: Rajendra Nayak Date: Wed, 6 Jun 2012 09:11:30 +0000 (+0530) Subject: clk: cache parent clocks only for muxes X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=9ca1c5a4bf4105d6f2f2a46892495953dd3e2fec;p=deliverable%2Flinux.git 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 [mturquette@linaro.org: removed extra parentheses] Signed-off-by: Mike Turquette --- 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) * If clk->parents is not NULL we skip this entire block. This allows * for clock drivers to statically initialize clk->parents. */ - if (clk->num_parents && !clk->parents) { - clk->parents = kmalloc((sizeof(struct clk*) * clk->num_parents), + if (clk->num_parents > 1 && !clk->parents) { + clk->parents = kzalloc((sizeof(struct clk*) * clk->num_parents), GFP_KERNEL); /* * __clk_lookup returns NULL for parents that have not been