diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2013-09-06 23:23:44 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2013-09-06 23:23:44 -0400 |
| commit | 07176b988ebb20f46a317a60ee1d983fe1630203 (patch) | |
| tree | e54affb1f823742078c68d9506e6035016bc2ea4 /drivers/input/joystick | |
| parent | fa46c7984092f3dbdbb3bcd7338d81a1168d9d2b (diff) | |
| parent | 52764fed5049655926bcecaefd52f0a415ceb105 (diff) | |
Merge branch 'next' into for-linus
Merge first round of changes for 3.12 merge window.
Diffstat (limited to 'drivers/input/joystick')
| -rw-r--r-- | drivers/input/joystick/as5011.c | 3 | ||||
| -rw-r--r-- | drivers/input/joystick/maplecontrol.c | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/drivers/input/joystick/as5011.c b/drivers/input/joystick/as5011.c index 121cd63d3334..005d852a06e9 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 | ||
| @@ -288,6 +288,7 @@ static int as5011_probe(struct i2c_client *client, | |||
| 288 | if (irq < 0) { | 288 | if (irq < 0) { |
| 289 | dev_err(&client->dev, | 289 | dev_err(&client->dev, |
| 290 | "Failed to get irq number for button gpio\n"); | 290 | "Failed to get irq number for button gpio\n"); |
| 291 | error = irq; | ||
| 291 | goto err_free_button_gpio; | 292 | goto err_free_button_gpio; |
| 292 | } | 293 | } |
| 293 | 294 | ||
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 | ||
| 62 | static int dc_pad_open(struct input_dev *dev) | 62 | static 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 | ||
| 72 | static void dc_pad_close(struct input_dev *dev) | 72 | static 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); |