1 files changed, 5 insertions, 5 deletions

diff --git a/drivers/input/keyboard/omap4-keypad.c b/drivers/input/keyboard/omap4-keypad.c
index c05f98c41410..e25b022692cd 100644
--- a/drivers/input/keyboard/omap4-keypad.c
+++ b/drivers/input/keyboard/omap4-keypad.c
@@ -211,8 +211,8 @@ static void omap4_keypad_close(struct input_dev *input)
 }
 
 #ifdef CONFIG_OF
-static int __devinit omap4_keypad_parse_dt(struct device *dev,
-                                           struct omap4_keypad *keypad_data)
+static int omap4_keypad_parse_dt(struct device *dev,
+                                 struct omap4_keypad *keypad_data)
 {
         struct device_node *np = dev->of_node;
 
@@ -241,7 +241,7 @@ static inline int omap4_keypad_parse_dt(struct device *dev,
 }
 #endif
 
-static int __devinit omap4_keypad_probe(struct platform_device *pdev)
+static int omap4_keypad_probe(struct platform_device *pdev)
 {
         const struct omap4_keypad_platform_data *pdata =
                                 dev_get_platdata(&pdev->dev);
@@ -406,7 +406,7 @@ err_free_keypad:
         return error;
 }
 
-static int __devexit omap4_keypad_remove(struct platform_device *pdev)
+static int omap4_keypad_remove(struct platform_device *pdev)
 {
         struct omap4_keypad *keypad_data = platform_get_drvdata(pdev);
         struct resource *res;
@@ -440,7 +440,7 @@ MODULE_DEVICE_TABLE(of, omap_keypad_dt_match);
 
 static struct platform_driver omap4_keypad_driver = {
         .probe          = omap4_keypad_probe,
-        .remove         = __devexit_p(omap4_keypad_remove),
+        .remove         = omap4_keypad_remove,
         .driver         = {
                 .name   = "omap4-keypad",
                 .owner  = THIS_MODULE,