aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/input/joystick/as5011.c2
-rw-r--r--drivers/input/joystick/maplecontrol.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/input/joystick/as5011.c b/drivers/input/joystick/as5011.c
index 121cd63d3334..13eba2a8c4e0 100644
--- a/drivers/input/joystick/as5011.c
+++ b/drivers/input/joystick/as5011.c
@@ -234,7 +234,7 @@ static int as5011_probe(struct i2c_client *client,
234 int irq; 234 int irq;
235 int error; 235 int error;
236 236
237 plat_data = client->dev.platform_data; 237 plat_data = dev_get_platdata(&client->dev);
238 if (!plat_data) 238 if (!plat_data)
239 return -EINVAL; 239 return -EINVAL;
240 240
diff --git a/drivers/input/joystick/maplecontrol.c b/drivers/input/joystick/maplecontrol.c
index 59c10ec5a2a1..8aa6e4c497da 100644
--- a/drivers/input/joystick/maplecontrol.c
+++ b/drivers/input/joystick/maplecontrol.c
@@ -61,7 +61,7 @@ static void dc_pad_callback(struct mapleq *mq)
61 61
62static int dc_pad_open(struct input_dev *dev) 62static int dc_pad_open(struct input_dev *dev)
63{ 63{
64 struct dc_pad *pad = dev->dev.platform_data; 64 struct dc_pad *pad = dev_get_platdata(&dev->dev);
65 65
66 maple_getcond_callback(pad->mdev, dc_pad_callback, HZ/20, 66 maple_getcond_callback(pad->mdev, dc_pad_callback, HZ/20,
67 MAPLE_FUNC_CONTROLLER); 67 MAPLE_FUNC_CONTROLLER);
@@ -71,7 +71,7 @@ static int dc_pad_open(struct input_dev *dev)
71 71
72static void dc_pad_close(struct input_dev *dev) 72static void dc_pad_close(struct input_dev *dev)
73{ 73{
74 struct dc_pad *pad = dev->dev.platform_data; 74 struct dc_pad *pad = dev_get_platdata(&dev->dev);
75 75
76 maple_getcond_callback(pad->mdev, dc_pad_callback, 0, 76 maple_getcond_callback(pad->mdev, dc_pad_callback, 0,
77 MAPLE_FUNC_CONTROLLER); 77 MAPLE_FUNC_CONTROLLER);