From patchwork Thu Nov 12 05:45:17 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nishanth Menon X-Patchwork-Id: 59505 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 nAC5jxuD016152 for ; Thu, 12 Nov 2009 05:46:01 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753450AbZKLFpy (ORCPT ); Thu, 12 Nov 2009 00:45:54 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753347AbZKLFpy (ORCPT ); Thu, 12 Nov 2009 00:45:54 -0500 Received: from devils.ext.ti.com ([198.47.26.153]:46933 "EHLO devils.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753398AbZKLFpr (ORCPT ); Thu, 12 Nov 2009 00:45:47 -0500 Received: from dlep34.itg.ti.com ([157.170.170.115]) by devils.ext.ti.com (8.13.7/8.13.7) with ESMTP id nAC5jpE1023168 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 11 Nov 2009 23:45:51 -0600 Received: from legion.dal.design.ti.com (localhost [127.0.0.1]) by dlep34.itg.ti.com (8.13.7/8.13.7) with ESMTP id nAC5jjAw013368; Wed, 11 Nov 2009 23:45:45 -0600 (CST) Received: from senorita (senorita.am.dhcp.ti.com [128.247.75.1]) by legion.dal.design.ti.com (8.11.7p1+Sun/8.11.7) with ESMTP id nAC5jiZ25587; Wed, 11 Nov 2009 23:45:44 -0600 (CST) Received: by senorita (Postfix, from userid 1000) id 3299DC1DC; Wed, 11 Nov 2009 23:45:43 -0600 (CST) From: Nishanth Menon To: linux-omap Cc: Nishanth Menon , Benoit Cousson , Kevin Hilman , Madhusudhan Chikkature Rajashekar , Paul Walmsley , Romit Dasgupta , Sanjeev Premi , Santosh Shilimkar , Sergio Alberto Aguirre Rodriguez , Thara Gopinath , Vishwanath Sripathy Subject: [PATCH 5/9] omap3: pm: sr: replace get_opp with freq_to_opp Date: Wed, 11 Nov 2009 23:45:17 -0600 Message-Id: <1258004721-7315-6-git-send-email-nm@ti.com> X-Mailer: git-send-email 1.6.3.3 In-Reply-To: <1258004721-7315-5-git-send-email-nm@ti.com> References: <1258004721-7315-1-git-send-email-nm@ti.com> <1258004721-7315-2-git-send-email-nm@ti.com> <1258004721-7315-3-git-send-email-nm@ti.com> <1258004721-7315-4-git-send-email-nm@ti.com> <1258004721-7315-5-git-send-email-nm@ti.com> Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org diff --git a/arch/arm/mach-omap2/smartreflex.c b/arch/arm/mach-omap2/smartreflex.c index be3a1da..d34224d 100644 --- a/arch/arm/mach-omap2/smartreflex.c +++ b/arch/arm/mach-omap2/smartreflex.c @@ -146,49 +146,29 @@ static u32 cal_test_nvalue(u32 sennval, u32 senpval) (rnsenn << NVALUERECIPROCAL_RNSENN_SHIFT); } -/* determine the current OPP from the frequency - * we need to give this function last element of OPP rate table - * and the frequency - */ -static u16 get_opp(struct omap_opp *opp_freq_table, - unsigned long freq) -{ - struct omap_opp *prcm_config; - - prcm_config = opp_freq_table; - - if (prcm_config->rate <= freq) - return prcm_config->opp_id; /* Return the Highest OPP */ - for (; prcm_config->rate; prcm_config--) - if (prcm_config->rate < freq) - return (prcm_config+1)->opp_id; - else if (prcm_config->rate == freq) - return prcm_config->opp_id; - /* Return the least OPP */ - return (prcm_config+1)->opp_id; -} - -static u16 get_vdd1_opp(void) +static u8 get_vdd1_opp(void) { - u16 opp; + u8 opp; if (sr1.vdd_opp_clk == NULL || IS_ERR(sr1.vdd_opp_clk) || mpu_opps == NULL) return 0; - opp = get_opp(mpu_opps + MAX_VDD1_OPP, sr1.vdd_opp_clk->rate); + /* Not expected to fail.. */ + BUG_ON(freq_to_opp(&opp, mpu_opps, sr1.vdd_opp_clk->rate)); return opp; } -static u16 get_vdd2_opp(void) +static u8 get_vdd2_opp(void) { - u16 opp; + u8 opp; if (sr2.vdd_opp_clk == NULL || IS_ERR(sr2.vdd_opp_clk) || l3_opps == NULL) return 0; - opp = get_opp(l3_opps + MAX_VDD2_OPP, sr2.vdd_opp_clk->rate); + /* Not expected to fail.. */ + BUG_ON(freq_to_opp(&opp, l3_opps, sr2.vdd_opp_clk->rate)); return opp; }