diff options
Diffstat (limited to 'drivers/input/keyboard/pxa27x_keypad.c')
-rw-r--r-- | drivers/input/keyboard/pxa27x_keypad.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/input/keyboard/pxa27x_keypad.c b/drivers/input/keyboard/pxa27x_keypad.c index cad9d5dd5973..5330d8fbf6c0 100644 --- a/drivers/input/keyboard/pxa27x_keypad.c +++ b/drivers/input/keyboard/pxa27x_keypad.c | |||
@@ -482,7 +482,7 @@ static const struct dev_pm_ops pxa27x_keypad_pm_ops = { | |||
482 | }; | 482 | }; |
483 | #endif | 483 | #endif |
484 | 484 | ||
485 | static int __devinit pxa27x_keypad_probe(struct platform_device *pdev) | 485 | static int pxa27x_keypad_probe(struct platform_device *pdev) |
486 | { | 486 | { |
487 | struct pxa27x_keypad_platform_data *pdata = pdev->dev.platform_data; | 487 | struct pxa27x_keypad_platform_data *pdata = pdev->dev.platform_data; |
488 | struct pxa27x_keypad *keypad; | 488 | struct pxa27x_keypad *keypad; |
@@ -595,7 +595,7 @@ failed_free: | |||
595 | return error; | 595 | return error; |
596 | } | 596 | } |
597 | 597 | ||
598 | static int __devexit pxa27x_keypad_remove(struct platform_device *pdev) | 598 | static int pxa27x_keypad_remove(struct platform_device *pdev) |
599 | { | 599 | { |
600 | struct pxa27x_keypad *keypad = platform_get_drvdata(pdev); | 600 | struct pxa27x_keypad *keypad = platform_get_drvdata(pdev); |
601 | struct resource *res; | 601 | struct resource *res; |
@@ -620,7 +620,7 @@ MODULE_ALIAS("platform:pxa27x-keypad"); | |||
620 | 620 | ||
621 | static struct platform_driver pxa27x_keypad_driver = { | 621 | static struct platform_driver pxa27x_keypad_driver = { |
622 | .probe = pxa27x_keypad_probe, | 622 | .probe = pxa27x_keypad_probe, |
623 | .remove = __devexit_p(pxa27x_keypad_remove), | 623 | .remove = pxa27x_keypad_remove, |
624 | .driver = { | 624 | .driver = { |
625 | .name = "pxa27x-keypad", | 625 | .name = "pxa27x-keypad", |
626 | .owner = THIS_MODULE, | 626 | .owner = THIS_MODULE, |