From: "Nayak, Rajendra" <rnayak@ti.com>
To: "linux-omap@vger.kernel.org" <linux-omap@vger.kernel.org>
Cc: "Nayak, Rajendra" <rnayak@ti.com>
Subject: [PATCH 01/09] OMAP3 clock: Revert "OMAP2/3 clock: add clock abort-rate-change notifications"
Date: Fri, 20 Mar 2009 18:55:39 +0530 [thread overview]
Message-ID: <5A47E75E594F054BAF48C5E4FC4B92AB02FAF6EF1E@dbde02.ent.ti.com> (raw)
From: Rajendra Nayak <rnayak@ti.com>
This reverts commit 39562d52cb454606790cf2036b6d491d3610953b.
Signed-off-by: Rajendra Nayak <rnayak@ti.com>
Signed-off-by: Tero Kristo <tero.kristo@nokia.com>
---
arch/arm/mach-omap2/clock.c | 16 ++++------------
1 files changed, 4 insertions(+), 12 deletions(-)
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;
}
--
1.5.4.3
reply other threads:[~2009-03-20 13:25 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5A47E75E594F054BAF48C5E4FC4B92AB02FAF6EF1E@dbde02.ent.ti.com \
--to=rnayak@ti.com \
--cc=linux-omap@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.