projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'linux-3.19' of git://anongit.freedesktop.org/git/nouveau/linux-2.6...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
input
/
touchscreen
/
zforce_ts.c
diff --git
a/drivers/input/touchscreen/zforce_ts.c
b/drivers/input/touchscreen/zforce_ts.c
index 8ba48f5eff7bfefebde28d38ea69e71e640e086a..19880c7385e35ab0c93d4d5746e081ca84b9b108 100644
(file)
--- a/
drivers/input/touchscreen/zforce_ts.c
+++ b/
drivers/input/touchscreen/zforce_ts.c
@@
-602,8
+602,7
@@
static void zforce_input_close(struct input_dev *dev)
return;
}
return;
}
-#ifdef CONFIG_PM_SLEEP
-static int zforce_suspend(struct device *dev)
+static int __maybe_unused zforce_suspend(struct device *dev)
{
struct i2c_client *client = to_i2c_client(dev);
struct zforce_ts *ts = i2c_get_clientdata(client);
{
struct i2c_client *client = to_i2c_client(dev);
struct zforce_ts *ts = i2c_get_clientdata(client);
@@
-648,7
+647,7
@@
unlock:
return ret;
}
return ret;
}
-static int zforce_resume(struct device *dev)
+static int
__maybe_unused
zforce_resume(struct device *dev)
{
struct i2c_client *client = to_i2c_client(dev);
struct zforce_ts *ts = i2c_get_clientdata(client);
{
struct i2c_client *client = to_i2c_client(dev);
struct zforce_ts *ts = i2c_get_clientdata(client);
@@
-685,7
+684,6
@@
unlock:
return ret;
}
return ret;
}
-#endif
static SIMPLE_DEV_PM_OPS(zforce_pm_ops, zforce_suspend, zforce_resume);
static SIMPLE_DEV_PM_OPS(zforce_pm_ops, zforce_suspend, zforce_resume);