From patchwork Fri Mar 20 13:26:02 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rajendra Nayak X-Patchwork-Id: 13315 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 n2KDQEUR029263 for ; Fri, 20 Mar 2009 13:26:15 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752560AbZCTN0O (ORCPT ); Fri, 20 Mar 2009 09:26:14 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752673AbZCTN0O (ORCPT ); Fri, 20 Mar 2009 09:26:14 -0400 Received: from devils.ext.ti.com ([198.47.26.153]:46706 "EHLO devils.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752560AbZCTN0N convert rfc822-to-8bit (ORCPT ); Fri, 20 Mar 2009 09:26:13 -0400 Received: from dbdp20.itg.ti.com ([172.24.170.38]) by devils.ext.ti.com (8.13.7/8.13.7) with ESMTP id n2KDQ4Hf013425 for ; Fri, 20 Mar 2009 08:26:11 -0500 Received: from dbde71.ent.ti.com (localhost [127.0.0.1]) by dbdp20.itg.ti.com (8.13.8/8.13.8) with ESMTP id n2KDQ47G002993 for ; Fri, 20 Mar 2009 18:56:04 +0530 (IST) Received: from dbde02.ent.ti.com ([172.24.170.145]) by dbde71.ent.ti.com ([172.24.170.149]) with mapi; Fri, 20 Mar 2009 18:56:04 +0530 From: "Nayak, Rajendra" To: "linux-omap@vger.kernel.org" CC: "Nayak, Rajendra" Date: Fri, 20 Mar 2009 18:56:02 +0530 Subject: [PATCH 04/09] OMAP3 clock: Revert "OMAP2/3 clock: add clk post-rate-change notifiers" Thread-Topic: [PATCH 04/09] OMAP3 clock: Revert "OMAP2/3 clock: add clk post-rate-change notifiers" Thread-Index: AcmpX2o/f5htF56EQryYLejb3dnX/Q== Message-ID: <5A47E75E594F054BAF48C5E4FC4B92AB02FAF6EF21@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 6b7ce1691c9084d562af4a1f3ffa2996a058ad06. Signed-off-by: Rajendra Nayak Signed-off-by: Tero Kristo --- 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; }