From patchwork Thu Apr 8 23:15:50 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: omar ramirez X-Patchwork-Id: 91530 X-Patchwork-Delegate: omar.ramirez@ti.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 o38Mxo5K010162 for ; Thu, 8 Apr 2010 22:59:50 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933806Ab0DHW7a (ORCPT ); Thu, 8 Apr 2010 18:59:30 -0400 Received: from comal.ext.ti.com ([198.47.26.152]:57271 "EHLO comal.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933799Ab0DHW71 (ORCPT ); Thu, 8 Apr 2010 18:59:27 -0400 Received: from dlep36.itg.ti.com ([157.170.170.91]) by comal.ext.ti.com (8.13.7/8.13.7) with ESMTP id o38MxNfd031194 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 8 Apr 2010 17:59:23 -0500 Received: from legion.dal.design.ti.com (localhost [127.0.0.1]) by dlep36.itg.ti.com (8.13.8/8.13.8) with ESMTP id o38MxMGL029518; Thu, 8 Apr 2010 17:59:22 -0500 (CDT) Received: from Matrix (matrix.am.dhcp.ti.com [128.247.75.166]) by legion.dal.design.ti.com (8.11.7p1+Sun/8.11.7) with ESMTP id o38MxMZ16486; Thu, 8 Apr 2010 17:59:22 -0500 (CDT) Received: by Matrix (Postfix, from userid 1003) id 29BFC410146; Thu, 8 Apr 2010 18:16:08 -0500 (CDT) From: Omar Ramirez Luna To: linux-omap@vger.kernel.org Cc: Paul Walmsley , Hiroshi DOYU , Felipe Contreras , Ameya Palande , Guzman Lugo Fernando , Nishanth Menon , Omar Ramirez Luna Subject: [PATCH 01/19] DSPBRIDGE: rename generic clk_handle for iva2_clk Date: Thu, 8 Apr 2010 18:15:50 -0500 Message-Id: <1270768568-10712-2-git-send-email-omar.ramirez@ti.com> X-Mailer: git-send-email 1.5.4.3 In-Reply-To: <1270768568-10712-1-git-send-email-omar.ramirez@ti.com> References: <1270768568-10712-1-git-send-email-omar.ramirez@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, 08 Apr 2010 22:59:50 +0000 (UTC) diff --git a/drivers/dsp/bridge/rmgr/drv_interface.c b/drivers/dsp/bridge/rmgr/drv_interface.c index d592181..862e01b 100644 --- a/drivers/dsp/bridge/rmgr/drv_interface.c +++ b/drivers/dsp/bridge/rmgr/drv_interface.c @@ -150,7 +150,7 @@ static struct file_operations bridge_fops = { #ifdef CONFIG_PM static u32 time_out = 1000; #ifdef CONFIG_BRIDGE_DVFS -static struct clk *clk_handle; +static struct clk *iva2_clk; s32 dsp_max_opps = VDD1_OPP5; #endif @@ -306,11 +306,11 @@ static int __devinit omap34_xx_bridge_probe(struct platform_device *pdev) for (i = 0; i < 6; i++) pdata->mpu_speed[i] = vdd1_rate_table_bridge[i].rate; - clk_handle = clk_get(NULL, "iva2_ck"); - if (!clk_handle) + iva2_clk = clk_get(NULL, "iva2_ck"); + if (!iva2_clk) pr_err("%s: clk_get failed to get iva2_ck\n", __func__); - if (clk_notifier_register(clk_handle, &iva_clk_notifier)) + if (clk_notifier_register(iva2_clk, &iva_clk_notifier)) pr_err("%s: clk_notifier_register failed for iva2_ck\n", __func__); #endif @@ -346,7 +346,7 @@ static int __devexit omap34_xx_bridge_remove(struct platform_device *pdev) goto func_cont; #ifdef CONFIG_BRIDGE_DVFS - if (clk_notifier_unregister(clk_handle, &iva_clk_notifier)) + if (clk_notifier_unregister(iva2_clk, &iva_clk_notifier)) pr_err("%s: clk_notifier_unregister failed for iva2_ck\n", __func__); #endif /* #ifdef CONFIG_BRIDGE_DVFS */ @@ -358,8 +358,8 @@ static int __devexit omap34_xx_bridge_remove(struct platform_device *pdev) DBC_ASSERT(ret == true); } #ifdef CONFIG_BRIDGE_DVFS - clk_put(clk_handle); - clk_handle = NULL; + clk_put(iva2_clk); + iva2_clk = NULL; #endif /* #ifdef CONFIG_BRIDGE_DVFS */ func_cont: