From: Viresh Kumar <viresh.kumar@st.com>
Date: Tue, 17 Apr 2012 11:15:38 +0000 (+0530)
Subject: clk: Don't set clk->new_rate twice
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=1b2f99037a29d48d03ddd2fd0dc117888ec737f4;p=~shefty%2Frdma-dev.git

clk: Don't set clk->new_rate twice

if (!clk->ops->round_rate && (clk->flags & CLK_SET_RATE_PARENT)) is true, then
we don't need to set clk->new_rate here, as we will call clk_calc_subtree()
afterwards and it also sets clk->new_rate.

Signed-off-by: Viresh Kumar <viresh.kumar@st.com>
Signed-off-by: Mike Turquette <mturquette@linaro.org>
---

diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c
index c6e8866289b..2dd20c01134 100644
--- a/drivers/clk/clk.c
+++ b/drivers/clk/clk.c
@@ -790,7 +790,7 @@ static struct clk *clk_calc_new_rates(struct clk *clk, unsigned long rate)
 
 	if (!clk->ops->round_rate) {
 		top = clk_calc_new_rates(clk->parent, rate);
-		new_rate = clk->new_rate = clk->parent->new_rate;
+		new_rate = clk->parent->new_rate;
 
 		goto out;
 	}