aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mfd
diff options
context:
space:
mode:
authorJingoo Han <jg1.han@samsung.com>2013-08-02 14:45:25 +0900
committerLee Jones <lee.jones@linaro.org>2013-08-07 09:48:12 +0100
commit9924713a77a23b4bc6ac2bc8f31f08a15f0b04e1 (patch)
tree677c5105cea0b99f5da493271739bdca5dce134c /drivers/mfd
parent59a9f7a32adf6537b4e4db8ca204eeb77d7a634e (diff)
downloadkernel_goldelico_gta04-9924713a77a23b4bc6ac2bc8f31f08a15f0b04e1.zip
kernel_goldelico_gta04-9924713a77a23b4bc6ac2bc8f31f08a15f0b04e1.tar.gz
kernel_goldelico_gta04-9924713a77a23b4bc6ac2bc8f31f08a15f0b04e1.tar.bz2
MFD: ucb1x00-core: Add CONFIG_PM_SLEEP to suspend/resume
Add CONFIG_PM_SLEEP to suspend/resume functions to fix the build warnings when CONFIG_PM_SLEEP is not selected. This is because sleep PM callbacks defined by SET_SYSTEM_SLEEP_PM_OPS are only used when the CONFIG_PM_SLEEP is enabled. drivers/mfd/ucb1x00-core.c:672:12: warning: 'ucb1x00_suspend' defined but not used [-Wunused-function] drivers/mfd/ucb1x00-core.c:704:12: warning: 'ucb1x00_resume' defined but not used [-Wunused-function] Signed-off-by: Jingoo Han <jg1.han@samsung.com> Signed-off-by: Lee Jones <lee.jones@linaro.org>
Diffstat (limited to 'drivers/mfd')
-rw-r--r--drivers/mfd/ucb1x00-core.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/mfd/ucb1x00-core.c b/drivers/mfd/ucb1x00-core.c
index 48ad48c..b7cf98f 100644
--- a/drivers/mfd/ucb1x00-core.c
+++ b/drivers/mfd/ucb1x00-core.c
@@ -669,6 +669,7 @@ void ucb1x00_unregister_driver(struct ucb1x00_driver *drv)
mutex_unlock(&ucb1x00_mutex);
}
+#ifdef CONFIG_PM_SLEEP
static int ucb1x00_suspend(struct device *dev)
{
struct ucb1x00_plat_data *pdata = dev_get_platdata(dev);
@@ -736,6 +737,7 @@ static int ucb1x00_resume(struct device *dev)
mutex_unlock(&ucb1x00_mutex);
return 0;
}
+#endif
static const struct dev_pm_ops ucb1x00_pm_ops = {
SET_SYSTEM_SLEEP_PM_OPS(ucb1x00_suspend, ucb1x00_resume)