Re: [PATCH] PM-wakeup: Delete unnecessary checks before two function calls
From: Pavel Machek <hidden>
Date: 2015-08-14 06:56:59
Also in:
kernel-janitors, lkml
On Sun 2015-06-28 12:21:53, SF Markus Elfring wrote:
From: Markus Elfring <redacted> Date: Sun, 28 Jun 2015 12:14:43 +0200 The functions dev_pm_disarm_wake_irq() and wakeup_source_unregister() test whether their argument is NULL and then return immediately. Thus the test around the calls is not needed. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring <redacted>
ACK.
quoted hunk ↗ jump to hunk
--- drivers/base/power/wakeup.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-)diff --git a/drivers/base/power/wakeup.c b/drivers/base/power/wakeup.c index 40f7160..3741bc2 100644 --- a/drivers/base/power/wakeup.c +++ b/drivers/base/power/wakeup.c@@ -341,8 +341,7 @@ void device_wakeup_arm_wake_irqs(void) rcu_read_lock(); list_for_each_entry_rcu(ws, &wakeup_sources, entry) { - if (ws->wakeirq) - dev_pm_arm_wake_irq(ws->wakeirq); + dev_pm_arm_wake_irq(ws->wakeirq); } rcu_read_unlock(); }@@ -358,8 +357,7 @@ void device_wakeup_disarm_wake_irqs(void) rcu_read_lock(); list_for_each_entry_rcu(ws, &wakeup_sources, entry) { - if (ws->wakeirq) - dev_pm_disarm_wake_irq(ws->wakeirq); + dev_pm_disarm_wake_irq(ws->wakeirq); } rcu_read_unlock(); }@@ -396,9 +394,7 @@ int device_wakeup_disable(struct device *dev) return -EINVAL; ws = device_wakeup_detach(dev); - if (ws) - wakeup_source_unregister(ws); - + wakeup_source_unregister(ws); return 0; } EXPORT_SYMBOL_GPL(device_wakeup_disable);-- 2.4.4
-- (english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html