From: Kevin Hilman <khilman@ti.com>
Date: Thu, 1 Sep 2011 17:59:36 +0000 (-0700)
Subject: OMAP: omap_device: fix !CONFIG_SUSPEND case in _noirq handlers
X-Git-Tag: v3.1-rc6~2^2^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=126caf1376e75ce597f993b66241210c7171b04e;p=profile%2Fivi%2Fkernel-adaptation-intel-automotive.git

OMAP: omap_device: fix !CONFIG_SUSPEND case in _noirq handlers

The suspend/resume _noirq handlers were #ifdef'd out in the
!CONFIG_SUSPEND case, but were still assigned to the dev_pm_ops
struct.  Fix by defining them to NULL in the !CONFIG_SUSPEND case.

Reported-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Kevin Hilman <khilman@ti.com>
---

diff --git a/arch/arm/plat-omap/omap_device.c b/arch/arm/plat-omap/omap_device.c
index 9a6a538..02609ee 100644
--- a/arch/arm/plat-omap/omap_device.c
+++ b/arch/arm/plat-omap/omap_device.c
@@ -615,6 +615,9 @@ static int _od_resume_noirq(struct device *dev)
 
 	return pm_generic_resume_noirq(dev);
 }
+#else
+#define _od_suspend_noirq NULL
+#define _od_resume_noirq NULL
 #endif
 
 static struct dev_pm_domain omap_device_pm_domain = {