From: Rajendra Nayak <rna...@ti.com>

This reverts commit 6b7ce1691c9084d562af4a1f3ffa2996a058ad06.

Signed-off-by: Rajendra Nayak <rna...@ti.com>
Signed-off-by: Tero Kristo <tero.kri...@nokia.com>
---
 arch/arm/mach-omap2/clock.c |   11 +----------
 1 files changed, 1 insertions(+), 10 deletions(-)

diff --git a/arch/arm/mach-omap2/clock.c b/arch/arm/mach-omap2/clock.c
index fe07d11..c29ea77 100644
--- a/arch/arm/mach-omap2/clock.c
+++ b/arch/arm/mach-omap2/clock.c
@@ -783,7 +783,6 @@ int omap2_clksel_set_rate(struct clk *clk, unsigned long 
rate)
 int omap2_clk_set_rate(struct clk *clk, unsigned long rate)
 {
        int ret = -EINVAL;
-       unsigned long temp_rate;
 
        if (!clk->set_rate)
                return -EINVAL;
@@ -798,11 +797,6 @@ int omap2_clk_set_rate(struct clk *clk, unsigned long rate)
 
        ret = clk->set_rate(clk, rate);
 
-       temp_rate = clk->rate;
-       clk->rate = clk->temp_rate;
-       omap_clk_notify_downstream(clk, CLK_POST_RATE_CHANGE);
-       clk->rate = temp_rate;
-
        return ret;
 }
 
@@ -878,14 +872,11 @@ int omap2_clk_set_parent(struct clk *clk, struct clk 
*new_parent)
                _omap2_clk_enable(clk);
 
        clk->parent = new_parent;
+       clk->rate = new_rate;
 
        pr_debug("clock: %s: set parent to %s (orig rate %ld, new rate %ld)\n",
                 clk->name, clk->parent->name, orig_rate, new_rate);
 
-       omap_clk_notify_downstream(clk, CLK_POST_RATE_CHANGE);
-
-       clk->rate = new_rate;
-
        return 0;
 }
 
-- 
1.5.4.3
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to