From patchwork Fri Mar 20 13:25:47 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rajendra Nayak X-Patchwork-Id: 13313 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 n2KDQ0fB029200 for ; Fri, 20 Mar 2009 13:26:01 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752366AbZCTNZ7 (ORCPT ); Fri, 20 Mar 2009 09:25:59 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752560AbZCTNZ7 (ORCPT ); Fri, 20 Mar 2009 09:25:59 -0400 Received: from devils.ext.ti.com ([198.47.26.153]:46698 "EHLO devils.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752366AbZCTNZ6 convert rfc822-to-8bit (ORCPT ); Fri, 20 Mar 2009 09:25:58 -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 n2KDPoNd013408 for ; Fri, 20 Mar 2009 08:25:56 -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 n2KDPnEZ002948 for ; Fri, 20 Mar 2009 18:55:49 +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:49 +0530 From: "Nayak, Rajendra" To: "linux-omap@vger.kernel.org" CC: "Nayak, Rajendra" Date: Fri, 20 Mar 2009 18:55:47 +0530 Subject: [PATCH 02/09] OMAP3 clock: Revert "OMAP2/3 clock: add clock prepare-rate-change notifications" Thread-Topic: [PATCH 02/09] OMAP3 clock: Revert "OMAP2/3 clock: add clock prepare-rate-change notifications" Thread-Index: AcmpX2EcItAiyudNTkejm2MlQ1zdTw== Message-ID: <5A47E75E594F054BAF48C5E4FC4B92AB02FAF6EF1F@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 7fa29eca41dfbc2417c68d09e191e56f38072ad6. Signed-off-by: Rajendra Nayak Signed-off-by: Tero Kristo --- 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)