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.
Similar, disabling wakeup in the probe error path is unnecessary, as is
disabling wakeup in the probe function in the first place.
Changes were done automatically using the following coccinelle script.
@probe@
identifier p, probefn;
declarer name module_platform_driver_probe;
position pos;
@@
(
module_platform_driver_probe(p, probefn@pos);
|
struct platform_driver p = {
.probe = probefn@pos,
};
|
struct i2c_driver p = {
.probe = probefn@pos,
};
|
struct spi_driver p = {
.probe = probefn@pos,
};
)
@remove@
identifier p, removefn;
@@
struct
(
platform_driver
|
i2c_driver
|
spi_driver
|
hv_driver
)
p = {
.remove = \(__exit_p(removefn)\|removefn\),
};
@depends on remove@
identifier remove.removefn;
@@
removefn(...) {
<+...
- device_init_wakeup(...);
...+>
}
@depends on probe@
identifier probe.probefn;
expression dev;
@@
probefn(...) {
<+...
- device_init_wakeup(..., \(false\|0\));
...+>
}
Signed-off-by: Guenter Roeck <linux@xxxxxxxxxxxx>
---
drivers/input/serio/hyperv-keyboard.c | 1 -
1 file changed, 1 deletion(-)
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);
--
2.7.4
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
