From patchwork Thu Mar 18 18:44:48 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nishanth Menon X-Patchwork-Id: 86793 X-Patchwork-Delegate: khilman@deeprootsystems.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o2IIjLOi031828 for ; Thu, 18 Mar 2010 18:45:23 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751652Ab0CRSpW (ORCPT ); Thu, 18 Mar 2010 14:45:22 -0400 Received: from comal.ext.ti.com ([198.47.26.152]:38370 "EHLO comal.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751317Ab0CRSpW (ORCPT ); Thu, 18 Mar 2010 14:45:22 -0400 Received: from dlep34.itg.ti.com ([157.170.170.115]) by comal.ext.ti.com (8.13.7/8.13.7) with ESMTP id o2IIjHPr010395 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 18 Mar 2010 13:45:17 -0500 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 o2IIjDLP004437; Thu, 18 Mar 2010 13:45:13 -0500 (CDT) 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 o2IIjDZ10083; Thu, 18 Mar 2010 13:45:13 -0500 (CDT) Received: by senorita (Postfix, from userid 1000) id 117A5C23A; Thu, 18 Mar 2010 13:45:12 -0500 (CDT) From: Nishanth Menon To: Linux-Omap Cc: Nishanth Menon , Ambresh K , Benoit Cousson , Eduardo Valentin , Kevin Hilman , Phil Carmody , Sanjeev Premi , Tero Kristo , Thara Gopinath Subject: [PM-WIP-OPP][PATCH 1/4] omap3: pm: cpufreq: BUG_ON cleanup Date: Thu, 18 Mar 2010 13:44:48 -0500 Message-Id: <1268937891-19445-2-git-send-email-nm@ti.com> X-Mailer: git-send-email 1.6.3.3 In-Reply-To: <1268937891-19445-1-git-send-email-nm@ti.com> References: <1268937891-19445-1-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 X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Thu, 18 Mar 2010 18:45:24 +0000 (UTC) diff --git a/arch/arm/mach-omap2/cpufreq34xx.c b/arch/arm/mach-omap2/cpufreq34xx.c index c453ec5..f0ed3ae 100644 --- a/arch/arm/mach-omap2/cpufreq34xx.c +++ b/arch/arm/mach-omap2/cpufreq34xx.c @@ -111,6 +111,7 @@ static struct omap_opp_def __initdata omap36xx_dsp_rate_table[] = { void __init omap3_pm_init_opp_table(void) { + int r; struct omap_opp_def **omap3_opp_def_list; struct omap_opp_def *omap34xx_opp_def_list[] = { omap34xx_mpu_rate_table, @@ -126,8 +127,9 @@ void __init omap3_pm_init_opp_table(void) omap3_opp_def_list = cpu_is_omap3630() ? omap36xx_opp_def_list : omap34xx_opp_def_list; - BUG_ON(opp_init_list(OPP_MPU, omap3_opp_def_list[0])); - BUG_ON(opp_init_list(OPP_L3, omap3_opp_def_list[1])); - BUG_ON(opp_init_list(OPP_DSP, omap3_opp_def_list[2])); + r = opp_init_list(OPP_MPU, omap3_opp_def_list[0]); + r |= opp_init_list(OPP_L3, omap3_opp_def_list[1]); + r |= opp_init_list(OPP_DSP, omap3_opp_def_list[2]); + BUG_ON(r); }