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
Input: atmel_mxt_ts - use CONFIG_PM_SLEEP
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
input
/
touchscreen
/
atmel_mxt_ts.c
diff --git
a/drivers/input/touchscreen/atmel_mxt_ts.c
b/drivers/input/touchscreen/atmel_mxt_ts.c
index 19d4ea65ea017d5da31b3de5e1746086a0a77e84..0a6e368a5a9cc8accb0af986bf8e16bfac6d909a 100644
(file)
--- a/
drivers/input/touchscreen/atmel_mxt_ts.c
+++ b/
drivers/input/touchscreen/atmel_mxt_ts.c
@@
-1201,7
+1201,7
@@
static int __devexit mxt_remove(struct i2c_client *client)
return 0;
}
return 0;
}
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM
_SLEEP
static int mxt_suspend(struct device *dev)
{
struct i2c_client *client = to_i2c_client(dev);
static int mxt_suspend(struct device *dev)
{
struct i2c_client *client = to_i2c_client(dev);
@@
-1239,13
+1239,10
@@
static int mxt_resume(struct device *dev)
return 0;
}
return 0;
}
-
-static const struct dev_pm_ops mxt_pm_ops = {
- .suspend = mxt_suspend,
- .resume = mxt_resume,
-};
#endif
#endif
+static SIMPLE_DEV_PM_OPS(mxt_pm_ops, mxt_suspend, mxt_resume);
+
static const struct i2c_device_id mxt_id[] = {
{ "qt602240_ts", 0 },
{ "atmel_mxt_ts", 0 },
static const struct i2c_device_id mxt_id[] = {
{ "qt602240_ts", 0 },
{ "atmel_mxt_ts", 0 },
@@
-1258,9
+1255,7
@@
static struct i2c_driver mxt_driver = {
.driver = {
.name = "atmel_mxt_ts",
.owner = THIS_MODULE,
.driver = {
.name = "atmel_mxt_ts",
.owner = THIS_MODULE,
-#ifdef CONFIG_PM
.pm = &mxt_pm_ops,
.pm = &mxt_pm_ops,
-#endif
},
.probe = mxt_probe,
.remove = __devexit_p(mxt_remove),
},
.probe = mxt_probe,
.remove = __devexit_p(mxt_remove),