diff options
author | Daniel Kurtz <djkurtz@chromium.org> | 2012-05-09 01:29:14 -0400 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-05-10 23:39:04 -0400 |
commit | 3a73c8169e4f56c1161a95985b8489dd04a7bcbe (patch) | |
tree | 7a41190a5c0aeac6d0546f9a0906be9c2c9829ae /drivers/input | |
parent | d3132c5c95507d570987712d037d184c637171bb (diff) |
Input: atmel_mxt_ts - use CONFIG_PM_SLEEP
Simple cleanup to use newer PM APIs.
Signed-off-by: Daniel Kurtz <djkurtz@chromium.org>
Reviewed-by: Joonyoung Shim <jy0922.shim@samsung.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input')
-rw-r--r-- | drivers/input/touchscreen/atmel_mxt_ts.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c b/drivers/input/touchscreen/atmel_mxt_ts.c index 19d4ea65ea01..0a6e368a5a9c 100644 --- 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) | |||
1201 | return 0; | 1201 | return 0; |
1202 | } | 1202 | } |
1203 | 1203 | ||
1204 | #ifdef CONFIG_PM | 1204 | #ifdef CONFIG_PM_SLEEP |
1205 | static int mxt_suspend(struct device *dev) | 1205 | static int mxt_suspend(struct device *dev) |
1206 | { | 1206 | { |
1207 | struct i2c_client *client = to_i2c_client(dev); | 1207 | struct i2c_client *client = to_i2c_client(dev); |
@@ -1239,13 +1239,10 @@ static int mxt_resume(struct device *dev) | |||
1239 | 1239 | ||
1240 | return 0; | 1240 | return 0; |
1241 | } | 1241 | } |
1242 | |||
1243 | static const struct dev_pm_ops mxt_pm_ops = { | ||
1244 | .suspend = mxt_suspend, | ||
1245 | .resume = mxt_resume, | ||
1246 | }; | ||
1247 | #endif | 1242 | #endif |
1248 | 1243 | ||
1244 | static SIMPLE_DEV_PM_OPS(mxt_pm_ops, mxt_suspend, mxt_resume); | ||
1245 | |||
1249 | static const struct i2c_device_id mxt_id[] = { | 1246 | static const struct i2c_device_id mxt_id[] = { |
1250 | { "qt602240_ts", 0 }, | 1247 | { "qt602240_ts", 0 }, |
1251 | { "atmel_mxt_ts", 0 }, | 1248 | { "atmel_mxt_ts", 0 }, |
@@ -1258,9 +1255,7 @@ static struct i2c_driver mxt_driver = { | |||
1258 | .driver = { | 1255 | .driver = { |
1259 | .name = "atmel_mxt_ts", | 1256 | .name = "atmel_mxt_ts", |
1260 | .owner = THIS_MODULE, | 1257 | .owner = THIS_MODULE, |
1261 | #ifdef CONFIG_PM | ||
1262 | .pm = &mxt_pm_ops, | 1258 | .pm = &mxt_pm_ops, |
1263 | #endif | ||
1264 | }, | 1259 | }, |
1265 | .probe = mxt_probe, | 1260 | .probe = mxt_probe, |
1266 | .remove = __devexit_p(mxt_remove), | 1261 | .remove = __devexit_p(mxt_remove), |