[01/09] OMAP3 clock: Revert "OMAP2/3 clock: add clock abort-rate-change notifications"

Commit Message

Rajendra Nayak March 20, 2009, 1:25 p.m. UTC

From: Rajendra Nayak <[e-mail]>

This reverts commit 39562d52cb454606790cf2036b6d491d3610953b.

Signed-off-by: Rajendra Nayak <[e-mail]>
Signed-off-by: Tero Kristo <[e-mail]>
---
 arch/arm/mach-omap2/clock.c |   16 ++++------------
 1 files changed, 4 insertions(+), 12 deletions(-)

Patch

diff --git a/arch/arm/mach-omap2/clock.c b/arch/arm/mach-omap2/clock.c
index 3d10ae4..d90b98a 100644
--- a/arch/arm/mach-omap2/clock.c
+++ b/arch/arm/mach-omap2/clock.c
@@ -798,7 +798,6 @@  int omap2_clk_set_rate(struct clk *clk, unsigned long rate)
 	if (r == NOTIFY_BAD) {
 		pr_debug("clock: %s: clk_set_rate() aborted by notifier\n",
 			 clk->name);
-		omap_clk_notify_downstream(clk, CLK_ABORT_RATE_CHANGE);
 		return -EAGAIN;
 	}
 
@@ -809,16 +808,10 @@  int omap2_clk_set_rate(struct clk *clk, unsigned long rate)
 
 	ret = clk->set_rate(clk, rate);
 
-	if (ret == 0) {
-		temp_rate = clk->rate;
-		clk->rate = clk->temp_rate;
-		omap_clk_notify_downstream(clk, CLK_POST_RATE_CHANGE);
-		clk->rate = temp_rate;
-	} else {
-		pr_debug("clock: %s: clk_set_rate() aborted by failed "
-			 "set_rate(): %d\n", clk->name, ret);
-		omap_clk_notify_downstream(clk, CLK_ABORT_RATE_CHANGE);
-	}
+	temp_rate = clk->rate;
+	clk->rate = clk->temp_rate;
+	omap_clk_notify_downstream(clk, CLK_POST_RATE_CHANGE);
+	clk->rate = temp_rate;
 
 	return ret;
 }
@@ -884,7 +877,6 @@  int omap2_clk_set_parent(struct clk *clk, struct clk *new_parent)
 	if (r == NOTIFY_BAD) {
 		pr_debug("clock: %s: clk_set_parent() aborted by notifier\n",
 			 clk->name);
-		omap_clk_notify_downstream(clk, CLK_ABORT_RATE_CHANGE);
 		return -EAGAIN;
 	}