--- v2
+++ v4
@@ -1,50 +1,23 @@
-Simple cleanup to use newer PM APIs.
+This allows userspace to more easily distinguish which bus a particular
+atmel_mxt_ts device is attached to.
Signed-off-by: Daniel Kurtz <djkurtz@chromium.org>
-Reviewed-by: Joonyoung Shim <jy0922.shim@samsung.com>
---
- drivers/input/touchscreen/atmel_mxt_ts.c | 11 +++--------
- 1 files changed, 3 insertions(+), 8 deletions(-)
+ drivers/input/touchscreen/atmel_mxt_ts.c | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c b/drivers/input/touchscreen/atmel_mxt_ts.c
-index 19d4ea6..0a6e368 100644
+index 42e6450..eda9eed 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)
- return 0;
- }
+@@ -1106,6 +1106,7 @@ static int __devinit mxt_probe(struct i2c_client *client,
+ }
--#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),
+ input_dev->name = "Atmel maXTouch Touchscreen";
++ input_dev->phys = client->adapter->name;
+ input_dev->id.bustype = BUS_I2C;
+ input_dev->dev.parent = &client->dev;
+ input_dev->open = mxt_input_open;
--
1.7.7.3