From patchwork Fri Dec 18 23:05:38 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Hilman X-Patchwork-Id: 68864 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.2) with ESMTP id nBIN5pbq009641 for ; Fri, 18 Dec 2009 23:05:51 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933366AbZLRXFt (ORCPT ); Fri, 18 Dec 2009 18:05:49 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S933305AbZLRXFt (ORCPT ); Fri, 18 Dec 2009 18:05:49 -0500 Received: from mail-pz0-f171.google.com ([209.85.222.171]:41371 "EHLO mail-pz0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933319AbZLRXFs (ORCPT ); Fri, 18 Dec 2009 18:05:48 -0500 Received: by mail-pz0-f171.google.com with SMTP id 1so2538284pzk.33 for ; Fri, 18 Dec 2009 15:05:47 -0800 (PST) Received: by 10.143.27.2 with SMTP id e2mr2891546wfj.202.1261177547836; Fri, 18 Dec 2009 15:05:47 -0800 (PST) Received: from localhost (deeprootsystems.com [216.254.16.51]) by mx.google.com with ESMTPS id 23sm2780688pzk.8.2009.12.18.15.05.47 (version=TLSv1/SSLv3 cipher=RC4-MD5); Fri, 18 Dec 2009 15:05:47 -0800 (PST) From: Kevin Hilman To: linux-omap@vger.kernel.org Cc: nm@ti.com Subject: [PATCH v2 3/4] OMAP SR/SRF: use OPP API for OPP ID, remove direct access Date: Fri, 18 Dec 2009 15:05:38 -0800 Message-Id: <1261177539-15429-4-git-send-email-khilman@deeprootsystems.com> X-Mailer: git-send-email 1.6.6.rc2.1.g42108 In-Reply-To: <1261177539-15429-3-git-send-email-khilman@deeprootsystems.com> References: <1261177539-15429-1-git-send-email-khilman@deeprootsystems.com> <1261177539-15429-2-git-send-email-khilman@deeprootsystems.com> <1261177539-15429-3-git-send-email-khilman@deeprootsystems.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/resource34xx.c b/arch/arm/mach-omap2/resource34xx.c index 1fa8bb5..31b8af2 100644 --- a/arch/arm/mach-omap2/resource34xx.c +++ b/arch/arm/mach-omap2/resource34xx.c @@ -204,7 +204,7 @@ static int __deprecated freq_to_opp(u8 *opp_id, struct omap_opp *opps, opp = opp_find_freq_ceil(opps, &freq); if (IS_ERR(opp)) return -EINVAL; - *opp_id = opp->opp_id; + *opp_id = opp_get_opp_id(opp); return 0; } @@ -337,8 +337,8 @@ static int program_opp(int res, struct omap_opp *opp, int target_level, #ifdef CONFIG_OMAP_SMARTREFLEX unsigned long t_opp, c_opp; - t_opp = ID_VDD(res) | ID_OPP_NO(opp[target_level - 1].opp_id); - c_opp = ID_VDD(res) | ID_OPP_NO(opp[current_level - 1].opp_id); + t_opp = ID_VDD(res) | ID_OPP_NO(target_level - 1); + c_opp = ID_VDD(res) | ID_OPP_NO(current_level - 1); #endif /* See if have a freq associated, if not, invalid opp */ diff --git a/arch/arm/mach-omap2/smartreflex.c b/arch/arm/mach-omap2/smartreflex.c index 9c0d5bf..d341857 100644 --- a/arch/arm/mach-omap2/smartreflex.c +++ b/arch/arm/mach-omap2/smartreflex.c @@ -159,7 +159,7 @@ static u8 get_vdd1_opp(void) if (IS_ERR(opp)) return 0; - return opp->opp_id; + return opp_get_opp_id(opp); } static u8 get_vdd2_opp(void) @@ -174,7 +174,7 @@ static u8 get_vdd2_opp(void) if (IS_ERR(opp)) return 0; - return opp->opp_id; + return opp_get_opp_id(opp); }