From mboxrd@z Thu Jan 1 00:00:00 1970 From: Kevin Hilman Subject: Re: [PATCH] OMAP1: PM: Fix OMAP1610 build Date: Mon, 09 Aug 2010 11:12:53 -0700 Message-ID: <87wrrzk63e.fsf@deeprootsystems.com> References: <1279106545-3018-1-git-send-email-manjugk@ti.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from mail-pw0-f46.google.com ([209.85.160.46]:41231 "EHLO mail-pw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751029Ab0HISM5 (ORCPT ); Mon, 9 Aug 2010 14:12:57 -0400 Received: by pwj7 with SMTP id 7so1424700pwj.19 for ; Mon, 09 Aug 2010 11:12:56 -0700 (PDT) In-Reply-To: <1279106545-3018-1-git-send-email-manjugk@ti.com> (Manjunatha GK's message of "Wed, 14 Jul 2010 16:52:25 +0530") Sender: linux-omap-owner@vger.kernel.org List-Id: linux-omap@vger.kernel.org To: Manjunatha GK Cc: linux-omap@vger.kernel.org Manjunatha GK writes: > OMAP1610 build fails with following error on the branch pm-wip/hwmods-omap4. > > This patch fixes the build error. > arch/arm/mach-omap1/pm_bus.c: In function 'platform_pm_runtime_suspend': > arch/arm/mach-omap1/pm_bus.c:30: error: 'ret' undeclared (first use in this function) > arch/arm/mach-omap1/pm_bus.c:30: error: (Each undeclared identifier is reported only once > arch/arm/mach-omap1/pm_bus.c:30: error: for each function it appears in.) > arch/arm/mach-omap1/pm_bus.c:32: error: implicit declaration of function 'clk_get' > arch/arm/mach-omap1/pm_bus.c:32: warning: assignment makes pointer from integer without a cast > arch/arm/mach-omap1/pm_bus.c:33: error: implicit declaration of function 'IS_ERR' > arch/arm/mach-omap1/pm_bus.c:34: error: implicit declaration of function 'clk_disable' > arch/arm/mach-omap1/pm_bus.c:35: error: implicit declaration of function 'clk_put' > arch/arm/mach-omap1/pm_bus.c:38: warning: assignment makes pointer from integer without a cast > arch/arm/mach-omap1/pm_bus.c: In function 'platform_pm_runtime_resume': > arch/arm/mach-omap1/pm_bus.c:52: warning: assignment makes pointer from integer without a cast > arch/arm/mach-omap1/pm_bus.c:54: error: implicit declaration of function 'clk_enable' > arch/arm/mach-omap1/pm_bus.c:58: warning: assignment makes pointer from integer without a cast > arch/arm/mach-omap1/pm_bus.c:49: warning: unused variable 'r' > arch/arm/mach-omap1/pm_bus.c: In function 'platform_pm_runtime_idle': > arch/arm/mach-omap1/pm_bus.c:72: error: 'ret' undeclared (first use in this function) > make[1]: *** [arch/arm/mach-omap1/pm_bus.o] Error 1 > make: *** [arch/arm/mach-omap1] Error 2 > > This patch fixes build issues and same has been tested for omap_h2_1610_defconfig. > > Signed-off-by: Manjunatha GK > Cc: Kevin Hilman Thanks, will fold this into the OMAP1 bus support in pm-wip/runtime Kevin > --- > arch/arm/mach-omap1/pm_bus.c | 6 +++++- > 1 files changed, 5 insertions(+), 1 deletions(-) > > diff --git a/arch/arm/mach-omap1/pm_bus.c b/arch/arm/mach-omap1/pm_bus.c > index 29d651a..6c5ab40 100644 > --- a/arch/arm/mach-omap1/pm_bus.c > +++ b/arch/arm/mach-omap1/pm_bus.c > @@ -15,6 +15,8 @@ > #include > #include > #include > +#include > +#include > > #include > #include > @@ -23,6 +25,7 @@ > int platform_pm_runtime_suspend(struct device *dev) > { > struct clk *iclk, *fclk; > + int ret = 0; > > dev_dbg(dev, "%s\n", __func__); > > @@ -46,7 +49,7 @@ int platform_pm_runtime_suspend(struct device *dev) > > int platform_pm_runtime_resume(struct device *dev) > { > - int r, ret = 0; > + int ret = 0; > struct clk *iclk, *fclk; > > iclk = clk_get(dev, "ick"); > @@ -69,6 +72,7 @@ int platform_pm_runtime_resume(struct device *dev) > > int platform_pm_runtime_idle(struct device *dev) > { > + int ret = 0; > ret = pm_runtime_suspend(dev); > dev_dbg(dev, "%s [%d]\n", __func__, ret);