Input: keyboard - drop unnecessary calls to device_init_wakeup

Calling device_init_wakeup in the remove function is unnecessary since the
device is going away, and thus won't be able to cause any wakeups under any
circumstances. Besides, the driver cleanup code already handles the
necessary cleanup.

Similarly, disabling wakeup in the probe error path is unnecessary, as is
disabling wakeup in the probe function in the first place.

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

diff --git a/drivers/input/keyboard/gpio_keys.c b/drivers/input/keyboard/gpio_keys.c
index 50b19b95269856d5aad7fe55b098766c950dbd62..9c92cdf196e34125a9bc9cdb634daec0497a8575 100644 (file)
--- a/drivers/input/keyboard/gpio_keys.c
+++ b/drivers/input/keyboard/gpio_keys.c
@@ -845,8 +845,6 @@ static int gpio_keys_remove(struct platform_device *pdev)
 {
        sysfs_remove_group(&pdev->dev.kobj, &gpio_keys_attr_group);
 
-       device_init_wakeup(&pdev->dev, 0);
-
        return 0;
 }
 

diff --git a/drivers/input/keyboard/matrix_keypad.c b/drivers/input/keyboard/matrix_keypad.c
index 7f12b6579f822d48add2f6f42ab7f8a1ad068d11..18839cd5f76e089dc3da912cad7b7f04f6a302e9 100644 (file)
--- a/drivers/input/keyboard/matrix_keypad.c
+++ b/drivers/input/keyboard/matrix_keypad.c
@@ -545,8 +545,6 @@ static int matrix_keypad_remove(struct platform_device *pdev)
 {
        struct matrix_keypad *keypad = platform_get_drvdata(pdev);
 
-       device_init_wakeup(&pdev->dev, 0);
-
        matrix_keypad_free_gpio(keypad);
        input_unregister_device(keypad->input_dev);
        kfree(keypad);

diff --git a/drivers/input/keyboard/omap4-keypad.c b/drivers/input/keyboard/omap4-keypad.c
index 6639b2b8528aa6da9a518d3bd3dc0da3010f4a09..9ecb16701b133e3188fda0a1bbbfaa98e409b3d0 100644 (file)
--- a/drivers/input/keyboard/omap4-keypad.c
+++ b/drivers/input/keyboard/omap4-keypad.c
@@ -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);

diff --git a/drivers/input/keyboard/samsung-keypad.c b/drivers/input/keyboard/samsung-keypad.c
index 4e319eb9e19d9f75a67d7c2123cc3bf5550c86ad..316414465c779b23d8ec4a03b42d634013dca9a8 100644 (file)
--- a/drivers/input/keyboard/samsung-keypad.c
+++ b/drivers/input/keyboard/samsung-keypad.c
@@ -445,7 +445,6 @@ static int samsung_keypad_probe(struct platform_device *pdev)
 
 err_disable_runtime_pm:
        pm_runtime_disable(&pdev->dev);
-       device_init_wakeup(&pdev->dev, 0);
 err_unprepare_clk:
        clk_unprepare(keypad->clk);
        return error;
@@ -456,7 +455,6 @@ static int samsung_keypad_remove(struct platform_device *pdev)
        struct samsung_keypad *keypad = platform_get_drvdata(pdev);
 
        pm_runtime_disable(&pdev->dev);
-       device_init_wakeup(&pdev->dev, 0);
 
        input_unregister_device(keypad->input_dev);
 

diff --git a/drivers/input/keyboard/spear-keyboard.c b/drivers/input/keyboard/spear-keyboard.c
index 8083eaa0524ad8914d0fbc3eb240188741f6b44d..7d25fa338ab4c01408b3014b3f047702bd079717 100644 (file)
--- a/drivers/input/keyboard/spear-keyboard.c
+++ b/drivers/input/keyboard/spear-keyboard.c
@@ -283,8 +283,6 @@ static int spear_kbd_remove(struct platform_device *pdev)
        input_unregister_device(kbd->input);
        clk_unprepare(kbd->clk);
 
-       device_init_wakeup(&pdev->dev, 0);
-
        return 0;
 }