Merge branch 'xfs-O_TMPFILE-support' into for-next

[karo-tx-linux.git] / drivers / input / keyboard / max7359_keypad.c

diff --git a/drivers/input/keyboard/max7359_keypad.c b/drivers/input/keyboard/max7359_keypad.c
index bc2cdaf563fd76da86c9318f0159a9d7a492590f..430b54539720055c78c8e2832e70a03b1ed0a555 100644 (file)
--- a/drivers/input/keyboard/max7359_keypad.c
+++ b/drivers/input/keyboard/max7359_keypad.c
@@ -182,7 +182,8 @@ static void max7359_initialize(struct i2c_client *client)
 static int max7359_probe(struct i2c_client *client,
                                        const struct i2c_device_id *id)
 {
-       const struct matrix_keymap_data *keymap_data = client->dev.platform_data;
+       const struct matrix_keymap_data *keymap_data =
+                       dev_get_platdata(&client->dev);
        struct max7359_keypad *keypad;
        struct input_dev *input_dev;
        int ret;