diff options
| author | Guenter Roeck <linux@roeck-us.net> | 2017-01-21 23:47:44 -0800 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2017-01-21 23:53:19 -0800 |
| commit | de3a00ef21d6e803ee7c674c76a269016a1b308c (patch) | |
| tree | ac7f09d1d5f019eba6a3c4c25dc47fd2769a6070 /drivers/input/keyboard/samsung-keypad.c | |
| parent | d7ddf15414dd598b9b875664e6b7aebe6c988f5d (diff) | |
| download | talos-op-linux-de3a00ef21d6e803ee7c674c76a269016a1b308c.tar.gz talos-op-linux-de3a00ef21d6e803ee7c674c76a269016a1b308c.zip | |
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>
Diffstat (limited to 'drivers/input/keyboard/samsung-keypad.c')
| -rw-r--r-- | drivers/input/keyboard/samsung-keypad.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/input/keyboard/samsung-keypad.c b/drivers/input/keyboard/samsung-keypad.c index 4e319eb9e19d..316414465c77 100644 --- 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); |
