aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/common
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2014-11-21 05:48:54 -0500
committerArnd Bergmann <arnd@arndb.de>2014-11-21 06:31:52 -0500
commita850c427029e5b9953fe4d4fe4fef10a61ee165a (patch)
tree224fa6149d31d009afc65cf8dc55f618e2b96a5b /arch/arm/common
parenta6f5e6bdc25b6db98be44350ed15133c6601c1cd (diff)
ARM: common: edma: edma_pm_resume may be unused
The recently introduced resume hook in the edma driver is not referenced when CONFIG_PM_SLEEP is not set, which results in a compile warning in keystone builds. This adds an appropriate #ifdef. Cc: Nishanth Menon <nm@ti.com> Cc: Daniel Mack <zonque@gmail.com> Cc: Joel Fernandes <joelf@ti.com> Acked-by: Sekhar Nori <nsekhar@ti.com> Fixes: a2b1175131: ("ARM: common: edma: add suspend resume hook") Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/common')
-rw-r--r--arch/arm/common/edma.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/common/edma.c b/arch/arm/common/edma.c
index 79de6a23047b..e093f2fcee7a 100644
--- a/arch/arm/common/edma.c
+++ b/arch/arm/common/edma.c
@@ -1801,6 +1801,7 @@ static int edma_probe(struct platform_device *pdev)
1801 return 0; 1801 return 0;
1802} 1802}
1803 1803
1804#ifdef CONFIG_PM_SLEEP
1804static int edma_pm_resume(struct device *dev) 1805static int edma_pm_resume(struct device *dev)
1805{ 1806{
1806 int i, j; 1807 int i, j;
@@ -1840,6 +1841,7 @@ static int edma_pm_resume(struct device *dev)
1840 1841
1841 return 0; 1842 return 0;
1842} 1843}
1844#endif
1843 1845
1844static const struct dev_pm_ops edma_pm_ops = { 1846static const struct dev_pm_ops edma_pm_ops = {
1845 SET_LATE_SYSTEM_SLEEP_PM_OPS(NULL, edma_pm_resume) 1847 SET_LATE_SYSTEM_SLEEP_PM_OPS(NULL, edma_pm_resume)