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

This reverts commit 7fa29eca41dfbc2417c68d09e191e56f38072ad6.

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

diff --git a/arch/arm/mach-omap2/clock.c b/arch/arm/mach-omap2/clock.c
index d90b98a..31b5b13 100644
--- a/arch/arm/mach-omap2/clock.c
+++ b/arch/arm/mach-omap2/clock.c
@@ -784,7 +784,6 @@ int omap2_clk_set_rate(struct clk *clk, unsigned long rate)
 {
        int ret = -EINVAL;
        unsigned long temp_rate;
-       int r;
 
        if (!clk->set_rate)
                return -EINVAL;
@@ -794,13 +793,6 @@ int omap2_clk_set_rate(struct clk *clk, unsigned long rate)
                propagate_rate(clk, TEMP_RATE);
        }
 
-       r = omap_clk_notify_downstream(clk, CLK_PREPARE_RATE_CHANGE);
-       if (r == NOTIFY_BAD) {
-               pr_debug("clock: %s: clk_set_rate() aborted by notifier\n",
-                        clk->name);
-               return -EAGAIN;
-       }
-
        pr_debug("clock: %s: set_rate from %ld Hz to %ld Hz\n", clk->name,
                 clk->rate, rate);
 
@@ -853,7 +845,6 @@ static u32 _omap2_clksel_get_src_field(struct clk *src_clk, 
struct clk *clk,
 int omap2_clk_set_parent(struct clk *clk, struct clk *new_parent)
 {
        u32 field_val, v, parent_div;
-       int r;
        unsigned long orig_rate, new_rate;
 
        if (!clk->clksel)
@@ -873,13 +864,6 @@ int omap2_clk_set_parent(struct clk *clk, struct clk 
*new_parent)
                propagate_rate(clk, TEMP_RATE);
        }
 
-       r = omap_clk_notify_downstream(clk, CLK_PREPARE_RATE_CHANGE);
-       if (r == NOTIFY_BAD) {
-               pr_debug("clock: %s: clk_set_parent() aborted by notifier\n",
-                        clk->name);
-               return -EAGAIN;
-       }
-
        omap_clk_notify_downstream(clk, CLK_PRE_RATE_CHANGE);
 
        if (clk->usecount > 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