aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input
diff options
context:
space:
mode:
authorJingoo Han <jg1.han@samsung.com>2013-08-05 12:04:23 -0400
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2013-08-13 01:32:18 -0400
commit04245e9fde5708ae5d44cece1e3d7b64f3f62513 (patch)
treeada33eca35c327406b317dfe56762c51f2ce83e2 /drivers/input
parent1bc754579ff17288d7dc69d2c3e38e4e6bf4960e (diff)
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')
-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:
291 return err; 291 return err;
292} 292}
293 293
294#ifdef CONFIG_PM 294#ifdef CONFIG_PM_SLEEP
295static int cy8ctmg110_suspend(struct device *dev) 295static int cy8ctmg110_suspend(struct device *dev)
296{ 296{
297 struct i2c_client *client = to_i2c_client(dev); 297 struct i2c_client *client = to_i2c_client(dev);
@@ -319,9 +319,9 @@ static int cy8ctmg110_resume(struct device *dev)
319 } 319 }
320 return 0; 320 return 0;
321} 321}
322#endif
322 323
323static SIMPLE_DEV_PM_OPS(cy8ctmg110_pm, cy8ctmg110_suspend, cy8ctmg110_resume); 324static SIMPLE_DEV_PM_OPS(cy8ctmg110_pm, cy8ctmg110_suspend, cy8ctmg110_resume);
324#endif
325 325
326static int cy8ctmg110_remove(struct i2c_client *client) 326static int cy8ctmg110_remove(struct i2c_client *client)
327{ 327{
@@ -351,9 +351,7 @@ static struct i2c_driver cy8ctmg110_driver = {
351 .driver = { 351 .driver = {
352 .owner = THIS_MODULE, 352 .owner = THIS_MODULE,
353 .name = CY8CTMG110_DRIVER_NAME, 353 .name = CY8CTMG110_DRIVER_NAME,
354#ifdef CONFIG_PM
355 .pm = &cy8ctmg110_pm, 354 .pm = &cy8ctmg110_pm,
356#endif
357 }, 355 },
358 .id_table = cy8ctmg110_idtable, 356 .id_table = cy8ctmg110_idtable,
359 .probe = cy8ctmg110_probe, 357 .probe = cy8ctmg110_probe,