From: Guenter Roeck <linux@roeck-us.net>
To: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Cc: Stephen Hemminger <sthemmin@microsoft.com>,
Haiyang Zhang <haiyangz@microsoft.com>,
linux-kernel@vger.kernel.org, linux-input@vger.kernel.org,
devel@linuxdriverproject.org, Guenter Roeck <linux@roeck-us.net>
Subject: [PATCH 12/13] Input: serio - drop unnecessary calls to device_init_wakeup
Date: Sat, 21 Jan 2017 10:46:04 -0800 [thread overview]
Message-ID: <1485024365-3368-13-git-send-email-linux@roeck-us.net> (raw)
In-Reply-To: <1485024365-3368-1-git-send-email-linux@roeck-us.net>
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@roeck-us.net>
---
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
next prev parent reply other threads:[~2017-01-21 18:46 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-21 18:45 [PATCH 00/13] Input: Automated coccinelle cleanup (take 2) Guenter Roeck
2017-01-21 18:45 ` [PATCH 01/13] Input: keyboard - Drop calls to platform_set_drvdata and i2c_set_clientdata Guenter Roeck
2017-01-21 18:45 ` [PATCH 02/13] Input: misc " Guenter Roeck
2017-01-21 18:45 ` [PATCH 03/13] Input: touchscreen " Guenter Roeck
2017-01-21 18:45 ` [PATCH 04/13] Input: keyboard - Use local variables consistently Guenter Roeck
2017-01-26 10:31 ` Linus Walleij
2017-01-26 14:28 ` Guenter Roeck
2017-01-26 18:59 ` Dmitry Torokhov
2017-01-21 18:45 ` [PATCH 05/13] Input: misc " Guenter Roeck
2017-01-21 18:45 ` [PATCH 06/13] Input: mouse " Guenter Roeck
2017-01-21 18:45 ` [PATCH 07/13] Input: rmi4 - " Guenter Roeck
2017-01-21 18:46 ` [PATCH 08/13] Input: touchscreen " Guenter Roeck
2017-01-21 18:46 ` [PATCH 09/13] Input: keyboard - drop unnecessary calls to device_init_wakeup Guenter Roeck
2017-01-21 18:46 ` [PATCH 10/13] Input: misc " Guenter Roeck
2017-01-21 18:46 ` [PATCH 11/13] Input: touchscreen " Guenter Roeck
2017-01-21 18:46 ` Guenter Roeck [this message]
2017-01-21 18:46 ` [PATCH 13/13] Input: misc - drop empty remove functions Guenter Roeck
2017-01-22 8:31 ` [PATCH 00/13] Input: Automated coccinelle cleanup (take 2) Dmitry Torokhov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1485024365-3368-13-git-send-email-linux@roeck-us.net \
--to=linux@roeck-us.net \
--cc=devel@linuxdriverproject.org \
--cc=dmitry.torokhov@gmail.com \
--cc=haiyangz@microsoft.com \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=sthemmin@microsoft.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).