diff options
| author |   Paul Moore <pmoore@redhat.com> | 2014-03-31 09:49:07 -0400 |
|---|---|---|
| committer | Paul Moore <pmoore@redhat.com> | 2014-03-31 09:49:07 -0400 |
| commit | 6d32c850621b0be75777b9102b14f6268bbd9f0f (patch) | |
| tree | fec325f5c1ae763f5eccb3ca1254ab9d9d164b05 /drivers/input/touchscreen/mcs5000_ts.c | |
| parent | selinux: correctly label /proc inodes in use before the policy is loaded (diff) | |
| parent | Linux 3.14 (diff) | |
| download | linux-dev-6d32c850621b0be75777b9102b14f6268bbd9f0f.tar.xz linux-dev-6d32c850621b0be75777b9102b14f6268bbd9f0f.zip | |
Merge tag 'v3.14' into next
Linux 3.14
Diffstat (limited to 'drivers/input/touchscreen/mcs5000_ts.c')
| -rw-r--r-- | drivers/input/touchscreen/mcs5000_ts.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/input/touchscreen/mcs5000_ts.c b/drivers/input/touchscreen/mcs5000_ts.c index f9f4e0c56eda..647e36f5930e 100644 --- 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; |