|
@@ -1201,7 +1201,7 @@ static int __devexit mxt_remove(struct i2c_client *client)
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
-#ifdef CONFIG_PM
|
|
|
+#ifdef CONFIG_PM_SLEEP
|
|
|
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;
|
|
|
}
|
|
|
-
|
|
|
-static const struct dev_pm_ops mxt_pm_ops = {
|
|
|
- .suspend = mxt_suspend,
|
|
|
- .resume = mxt_resume,
|
|
|
-};
|
|
|
#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 },
|
|
@@ -1258,9 +1255,7 @@ static struct i2c_driver mxt_driver = {
|
|
|
.driver = {
|
|
|
.name = "atmel_mxt_ts",
|
|
|
.owner = THIS_MODULE,
|
|
|
-#ifdef CONFIG_PM
|
|
|
.pm = &mxt_pm_ops,
|
|
|
-#endif
|
|
|
},
|
|
|
.probe = mxt_probe,
|
|
|
.remove = __devexit_p(mxt_remove),
|