diff options
Diffstat (limited to 'drivers/input/keyboard/matrix_keypad.c')
-rw-r--r-- | drivers/input/keyboard/matrix_keypad.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/input/keyboard/matrix_keypad.c b/drivers/input/keyboard/matrix_keypad.c index ed2bacdf2cc..b9d67c2f30d 100644 --- a/drivers/input/keyboard/matrix_keypad.c +++ b/drivers/input/keyboard/matrix_keypad.c | |||
@@ -301,8 +301,8 @@ static int matrix_keypad_resume(struct device *dev) | |||
301 | static SIMPLE_DEV_PM_OPS(matrix_keypad_pm_ops, | 301 | static SIMPLE_DEV_PM_OPS(matrix_keypad_pm_ops, |
302 | matrix_keypad_suspend, matrix_keypad_resume); | 302 | matrix_keypad_suspend, matrix_keypad_resume); |
303 | 303 | ||
304 | static int __devinit matrix_keypad_init_gpio(struct platform_device *pdev, | 304 | static int matrix_keypad_init_gpio(struct platform_device *pdev, |
305 | struct matrix_keypad *keypad) | 305 | struct matrix_keypad *keypad) |
306 | { | 306 | { |
307 | const struct matrix_keypad_platform_data *pdata = keypad->pdata; | 307 | const struct matrix_keypad_platform_data *pdata = keypad->pdata; |
308 | int i, err; | 308 | int i, err; |
@@ -397,7 +397,7 @@ static void matrix_keypad_free_gpio(struct matrix_keypad *keypad) | |||
397 | } | 397 | } |
398 | 398 | ||
399 | #ifdef CONFIG_OF | 399 | #ifdef CONFIG_OF |
400 | static struct matrix_keypad_platform_data * __devinit | 400 | static struct matrix_keypad_platform_data * |
401 | matrix_keypad_parse_dt(struct device *dev) | 401 | matrix_keypad_parse_dt(struct device *dev) |
402 | { | 402 | { |
403 | struct matrix_keypad_platform_data *pdata; | 403 | struct matrix_keypad_platform_data *pdata; |
@@ -465,7 +465,7 @@ matrix_keypad_parse_dt(struct device *dev) | |||
465 | } | 465 | } |
466 | #endif | 466 | #endif |
467 | 467 | ||
468 | static int __devinit matrix_keypad_probe(struct platform_device *pdev) | 468 | static int matrix_keypad_probe(struct platform_device *pdev) |
469 | { | 469 | { |
470 | const struct matrix_keypad_platform_data *pdata; | 470 | const struct matrix_keypad_platform_data *pdata; |
471 | struct matrix_keypad *keypad; | 471 | struct matrix_keypad *keypad; |