summaryrefslogtreecommitdiffstats
path: root/drivers/input/touchscreen/cy8ctmg110_ts.c
diff options
context:
space:
mode:
authorJingoo Han <jg1.han@samsung.com>2013-08-05 18:04:23 +0200
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2013-08-13 07:32:18 +0200
commit04245e9fde5708ae5d44cece1e3d7b64f3f62513 (patch)
treeada33eca35c327406b317dfe56762c51f2ce83e2 /drivers/input/touchscreen/cy8ctmg110_ts.c
parentInput: max7359 - add CONFIG_PM_SLEEP to suspend/resume (diff)
downloadlinux-04245e9fde5708ae5d44cece1e3d7b64f3f62513.tar.xz
linux-04245e9fde5708ae5d44cece1e3d7b64f3f62513.zip
Input: cy8ctmg110_ts - 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/input/touchscreen/cy8ctmg110_ts.c:295:12: warning: 'cy8ctmg110_suspend' defined but not used [-Wunused-function] drivers/input/touchscreen/cy8ctmg110_ts.c:309:12: warning: 'cy8ctmg110_resume' defined but not used [-Wunused-function] Signed-off-by: Jingoo Han <jg1.han@samsung.com> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input/touchscreen/cy8ctmg110_ts.c')
-rw-r--r--drivers/input/touchscreen/cy8ctmg110_ts.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/input/touchscreen/cy8ctmg110_ts.c b/drivers/input/touchscreen/cy8ctmg110_ts.c
index 96e0eedcc7e5..8c651985a5c4 100644
--- a/drivers/input/touchscreen/cy8ctmg110_ts.c
+++ b/drivers/input/touchscreen/cy8ctmg110_ts.c
@@ -291,7 +291,7 @@ err_free_mem:
return err;
}
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
static int cy8ctmg110_suspend(struct device *dev)
{
struct i2c_client *client = to_i2c_client(dev);
@@ -319,9 +319,9 @@ static int cy8ctmg110_resume(struct device *dev)
}
return 0;
}
+#endif
static SIMPLE_DEV_PM_OPS(cy8ctmg110_pm, cy8ctmg110_suspend, cy8ctmg110_resume);
-#endif
static int cy8ctmg110_remove(struct i2c_client *client)
{
@@ -351,9 +351,7 @@ static struct i2c_driver cy8ctmg110_driver = {
.driver = {
.owner = THIS_MODULE,
.name = CY8CTMG110_DRIVER_NAME,
-#ifdef CONFIG_PM
.pm = &cy8ctmg110_pm,
-#endif
},
.id_table = cy8ctmg110_idtable,
.probe = cy8ctmg110_probe,