aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJingoo Han <jg1.han@samsung.com>2013-08-05 12:06:00 -0400
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2013-08-13 01:32:23 -0400
commit54e9f4501079c837bbcc535c8de5a2e2fcbf6782 (patch)
tree3877744c7c4a79886691ea4fbfb55982e9822138
parent04245e9fde5708ae5d44cece1e3d7b64f3f62513 (diff)
Input: eeti_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/eeti_ts.c:268:12: warning: 'eeti_ts_suspend' defined but not used [-Wunused-function] drivers/input/touchscreen/eeti_ts.c:287:12: warning: 'eeti_ts_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>
-rw-r--r--drivers/input/touchscreen/eeti_ts.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/input/touchscreen/eeti_ts.c b/drivers/input/touchscreen/eeti_ts.c
index 8fe5086c8d2e..1ce3d29ffca5 100644
--- a/drivers/input/touchscreen/eeti_ts.c
+++ b/drivers/input/touchscreen/eeti_ts.c
@@ -264,7 +264,7 @@ static int eeti_ts_remove(struct i2c_client *client)
264 return 0; 264 return 0;
265} 265}
266 266
267#ifdef CONFIG_PM 267#ifdef CONFIG_PM_SLEEP
268static int eeti_ts_suspend(struct device *dev) 268static int eeti_ts_suspend(struct device *dev)
269{ 269{
270 struct i2c_client *client = to_i2c_client(dev); 270 struct i2c_client *client = to_i2c_client(dev);
@@ -302,9 +302,9 @@ static int eeti_ts_resume(struct device *dev)
302 302
303 return 0; 303 return 0;
304} 304}
305#endif
305 306
306static SIMPLE_DEV_PM_OPS(eeti_ts_pm, eeti_ts_suspend, eeti_ts_resume); 307static SIMPLE_DEV_PM_OPS(eeti_ts_pm, eeti_ts_suspend, eeti_ts_resume);
307#endif
308 308
309static const struct i2c_device_id eeti_ts_id[] = { 309static const struct i2c_device_id eeti_ts_id[] = {
310 { "eeti_ts", 0 }, 310 { "eeti_ts", 0 },
@@ -315,9 +315,7 @@ MODULE_DEVICE_TABLE(i2c, eeti_ts_id);
315static struct i2c_driver eeti_ts_driver = { 315static struct i2c_driver eeti_ts_driver = {
316 .driver = { 316 .driver = {
317 .name = "eeti_ts", 317 .name = "eeti_ts",
318#ifdef CONFIG_PM
319 .pm = &eeti_ts_pm, 318 .pm = &eeti_ts_pm,
320#endif
321 }, 319 },
322 .probe = eeti_ts_probe, 320 .probe = eeti_ts_probe,
323 .remove = eeti_ts_remove, 321 .remove = eeti_ts_remove,