From patchwork Fri Mar 20 13:25:39 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rajendra Nayak X-Patchwork-Id: 13312 X-Patchwork-Delegate: khilman@deeprootsystems.com Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n2KDQ0fA029200 for ; Fri, 20 Mar 2009 13:26:01 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752325AbZCTNZu (ORCPT ); Fri, 20 Mar 2009 09:25:50 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752154AbZCTNZu (ORCPT ); Fri, 20 Mar 2009 09:25:50 -0400 Received: from arroyo.ext.ti.com ([192.94.94.40]:41061 "EHLO arroyo.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752325AbZCTNZt convert rfc822-to-8bit (ORCPT ); Fri, 20 Mar 2009 09:25:49 -0400 Received: from dbdp20.itg.ti.com ([172.24.170.38]) by arroyo.ext.ti.com (8.13.7/8.13.7) with ESMTP id n2KDPeZZ021042 for ; Fri, 20 Mar 2009 08:25:47 -0500 Received: from dbde70.ent.ti.com (localhost [127.0.0.1]) by dbdp20.itg.ti.com (8.13.8/8.13.8) with ESMTP id n2KDPeeg002929 for ; Fri, 20 Mar 2009 18:55:40 +0530 (IST) Received: from dbde02.ent.ti.com ([172.24.170.145]) by dbde70.ent.ti.com ([172.24.170.148]) with mapi; Fri, 20 Mar 2009 18:55:40 +0530 From: "Nayak, Rajendra" To: "linux-omap@vger.kernel.org" CC: "Nayak, Rajendra" Date: Fri, 20 Mar 2009 18:55:39 +0530 Subject: [PATCH 01/09] OMAP3 clock: Revert "OMAP2/3 clock: add clock abort-rate-change notifications" Thread-Topic: [PATCH 01/09] OMAP3 clock: Revert "OMAP2/3 clock: add clock abort-rate-change notifications" Thread-Index: AcmpX1wsrMkGBnQfSm2skfibz2BR4A== Message-ID: <5A47E75E594F054BAF48C5E4FC4B92AB02FAF6EF1E@dbde02.ent.ti.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: acceptlanguage: en-US MIME-Version: 1.0 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org From: Rajendra Nayak This reverts commit 39562d52cb454606790cf2036b6d491d3610953b. Signed-off-by: Rajendra Nayak Signed-off-by: Tero Kristo --- 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; }