summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuenter Roeck <linux@roeck-us.net>2017-01-22 08:49:38 +0100
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2017-01-22 08:53:32 +0100
commitf20b161f59b73d40043199b3bff362e656a9c673 (patch)
treea4db556da65767c29ac12cfe366cf46c2948fafc
parentInput: touchscreen - drop unnecessary calls to device_init_wakeup (diff)
downloadlinux-f20b161f59b73d40043199b3bff362e656a9c673.tar.xz
linux-f20b161f59b73d40043199b3bff362e656a9c673.zip
Input: serio - 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>
-rw-r--r--drivers/input/serio/hyperv-keyboard.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/input/serio/hyperv-keyboard.c b/drivers/input/serio/hyperv-keyboard.c
index c948866edf87..25151d9214e0 100644
--- a/drivers/input/serio/hyperv-keyboard.c
+++ b/drivers/input/serio/hyperv-keyboard.c
@@ -402,7 +402,6 @@ static int hv_kbd_remove(struct hv_device *hv_dev)
{
struct hv_kbd_dev *kbd_dev = hv_get_drvdata(hv_dev);
- device_init_wakeup(&hv_dev->device, false);
serio_unregister_port(kbd_dev->hv_serio);
vmbus_close(hv_dev->channel);
kfree(kbd_dev);