Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[~andy/linux] / drivers / input / touchscreen / mcs5000_ts.c

diff --git a/drivers/input/touchscreen/mcs5000_ts.c b/drivers/input/touchscreen/mcs5000_ts.c
index f9f4e0c56eda9fec33439bcd8a54913f3953e462..647e36f5930e4c892ab56aa530a7463d0ef0df0f 100644 (file)
--- a/drivers/input/touchscreen/mcs5000_ts.c
+++ b/drivers/input/touchscreen/mcs5000_ts.c
@@ -14,7 +14,6 @@
  */
 
 #include <linux/module.h>
-#include <linux/init.h>
 #include <linux/i2c.h>
 #include <linux/i2c/mcs.h>
 #include <linux/interrupt.h>
@@ -194,7 +193,7 @@ static int mcs5000_ts_probe(struct i2c_client *client,
        struct input_dev *input_dev;
        int ret;
 
-       if (!client->dev.platform_data)
+       if (!dev_get_platdata(&client->dev))
                return -EINVAL;
 
        data = kzalloc(sizeof(struct mcs5000_ts_data), GFP_KERNEL);
@@ -207,7 +206,7 @@ static int mcs5000_ts_probe(struct i2c_client *client,
 
        data->client = client;
        data->input_dev = input_dev;
-       data->platform_data = client->dev.platform_data;
+       data->platform_data = dev_get_platdata(&client->dev);
 
        input_dev->name = "MELPAS MCS-5000 Touchscreen";
        input_dev->id.bustype = BUS_I2C;