[tip:x86/urgent] x86/platform/olpc: Fix resume handler build warning

From: tip-bot for Borislav Petkov
Date: Mon Nov 28 2016 - 02:22:31 EST


Commit-ID: 20ab6677716c7bbdcfd1cdb9aef296a0b3101f73
Gitweb: http://git.kernel.org/tip/20ab6677716c7bbdcfd1cdb9aef296a0b3101f73
Author: Borislav Petkov <bp@xxxxxxx>
AuthorDate: Sat, 26 Nov 2016 15:27:06 +0100
Committer: Ingo Molnar <mingo@xxxxxxxxxx>
CommitDate: Mon, 28 Nov 2016 07:46:03 +0100

x86/platform/olpc: Fix resume handler build warning

Fix:

arch/x86/platform/olpc/olpc-xo15-sci.c:199:12: warning: âxo15_sci_resumeâ
defined but not used [-Wunused-function]
static int xo15_sci_resume(struct device *dev)
^

which I see in randconfig builds here.

Signed-off-by: Borislav Petkov <bp@xxxxxxx>
Cc: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Link: http://lkml.kernel.org/r/20161126142706.13602-1-bp@xxxxxxxxx
Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx>
---
arch/x86/platform/olpc/olpc-xo15-sci.c | 2 ++
1 file changed, 2 insertions(+)

diff --git a/arch/x86/platform/olpc/olpc-xo15-sci.c b/arch/x86/platform/olpc/olpc-xo15-sci.c
index 5513084..c0533fb 100644
--- a/arch/x86/platform/olpc/olpc-xo15-sci.c
+++ b/arch/x86/platform/olpc/olpc-xo15-sci.c
@@ -196,6 +196,7 @@ static int xo15_sci_remove(struct acpi_device *device)
return 0;
}

+#ifdef CONFIG_PM_SLEEP
static int xo15_sci_resume(struct device *dev)
{
/* Enable all EC events */
@@ -207,6 +208,7 @@ static int xo15_sci_resume(struct device *dev)

return 0;
}
+#endif

static SIMPLE_DEV_PM_OPS(xo15_sci_pm, NULL, xo15_sci_resume);