Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-14 07:02:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Input: cy8ctmg110_ts - add CONFIG_PM_SLEEP to suspend/resume

Browse Source 
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>
This commit is contained in:
Jingoo Han 2013-08-05 09:04:23 -07:00 committed by Dmitry Torokhov
parent 1bc754579f
commit 04245e9fde
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/input/touchscreen/cy8ctmg110_ts.c
View File

@ -291,7 +291,7 @@ err_free_mem:
return err; return err;
} }
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
static int cy8ctmg110_suspend(struct device *dev) static int cy8ctmg110_suspend(struct device *dev)
{ {
struct i2c_client *client = to_i2c_client(dev); struct i2c_client *client = to_i2c_client(dev);
@ -319,9 +319,9 @@ static int cy8ctmg110_resume(struct device *dev)
} }
return 0; return 0;
} }
#endif
static SIMPLE_DEV_PM_OPS(cy8ctmg110_pm, cy8ctmg110_suspend, cy8ctmg110_resume); static SIMPLE_DEV_PM_OPS(cy8ctmg110_pm, cy8ctmg110_suspend, cy8ctmg110_resume);
#endif
static int cy8ctmg110_remove(struct i2c_client *client) static int cy8ctmg110_remove(struct i2c_client *client)
{ {
@ -351,9 +351,7 @@ static struct i2c_driver cy8ctmg110_driver = {
.driver = { .driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.name = CY8CTMG110_DRIVER_NAME, .name = CY8CTMG110_DRIVER_NAME,
#ifdef CONFIG_PM
.pm = &cy8ctmg110_pm, .pm = &cy8ctmg110_pm,
#endif
}, },
.id_table = cy8ctmg110_idtable, .id_table = cy8ctmg110_idtable,
.probe = cy8ctmg110_probe, .probe = cy8ctmg110_probe,