[PATCH] ARM: common: edma: edma_pm_resume may be unused

Arnd Bergmann arnd at arndb.de
Fri Nov 21 02:52:51 PST 2014

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_defconfig builds.

This adds an appropriate #ifdef.

Cc: Nishanth Menon <nm at ti.com>
Cc: Daniel Mack <zonque at gmail.com>
Cc: Joel Fernandes <joelf at ti.com>
Cc: Sekhar Nori <nsekhar at ti.com>
Fixes: a2b1175131: ("ARM: common: edma: add suspend resume hook")
Signed-off-by: Arnd Bergmann <arnd at arndb.de>
I'm applying this as the obvious fixup on top of the next/drivers

diff --git a/arch/arm/common/edma.c b/arch/arm/common/edma.c
index 24a2857f2285..5662a872689b 100644
--- a/arch/arm/common/edma.c
+++ b/arch/arm/common/edma.c
@@ -1810,6 +1810,7 @@ static int edma_probe(struct platform_device *pdev)
 	return 0;
 static int edma_pm_resume(struct device *dev)
 	int i, j;
@@ -1849,6 +1850,7 @@ static int edma_pm_resume(struct device *dev)
 	return 0;
 static const struct dev_pm_ops edma_pm_ops = {

More information about the linux-arm-kernel mailing list