linux-omap.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Manjunatha GK <manjugk@ti.com>
To: linux-omap@vger.kernel.org
Cc: Kevin Hilman <khilman@deeprootsystems.com>
Subject: [PATCH] OMAP1: PM: Fix OMAP1610 build
Date: Wed, 14 Jul 2010 16:52:25 +0530	[thread overview]
Message-ID: <1279106545-3018-1-git-send-email-manjugk@ti.com> (raw)

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 <manjugk@ti.com>
Cc: Kevin Hilman <khilman@deeprootsystems.com>
---
 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 <linux/pm_runtime.h>
 #include <linux/platform_device.h>
 #include <linux/mutex.h>
+#include <linux/clk.h>
+#include <linux/err.h>
 
 #include <plat/omap_device.h>
 #include <plat/omap-pm.h>
@@ -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);
 
-- 
1.7.0.4


             reply	other threads:[~2010-07-14 11:25 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-07-14 11:22 Manjunatha GK [this message]
2010-08-09 18:12 ` [PATCH] OMAP1: PM: Fix OMAP1610 build Kevin Hilman

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1279106545-3018-1-git-send-email-manjugk@ti.com \
    --to=manjugk@ti.com \
    --cc=khilman@deeprootsystems.com \
    --cc=linux-omap@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).