1 files changed, 2 insertions, 5 deletions

diff --git a/drivers/input/keyboard/omap4-keypad.c b/drivers/input/keyboard/omap4-keypad.c
index 6639b2b8528a..ebc67ba41fe2 100644
--- a/drivers/input/keyboard/omap4-keypad.c
+++ b/drivers/input/keyboard/omap4-keypad.c
@@ -223,8 +223,8 @@ static int omap4_keypad_parse_dt(struct device *dev,
         struct device_node *np = dev->of_node;
         int err;
 
-        err = matrix_keypad_parse_of_params(dev, &keypad_data->rows,
-                                            &keypad_data->cols);
+        err = matrix_keypad_parse_properties(dev, &keypad_data->rows,
+                                             &keypad_data->cols);
         if (err)
                 return err;
 
@@ -375,7 +375,6 @@ static int omap4_keypad_probe(struct platform_device *pdev)
 
 err_pm_disable:
         pm_runtime_disable(&pdev->dev);
-        device_init_wakeup(&pdev->dev, false);
         free_irq(keypad_data->irq, keypad_data);
 err_free_keymap:
         kfree(keypad_data->keymap);
@@ -401,8 +400,6 @@ static int omap4_keypad_remove(struct platform_device *pdev)
 
         pm_runtime_disable(&pdev->dev);
 
-        device_init_wakeup(&pdev->dev, false);
-
         input_unregister_device(keypad_data->input);
 
         iounmap(keypad_data->base);