]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
PM-wakeup: Delete unnecessary checks before three function calls
authorMarkus Elfring <elfring@users.sourceforge.net>
Sat, 23 Jul 2016 15:04:00 +0000 (17:04 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 28 Jul 2016 21:51:04 +0000 (23:51 +0200)
The following functions test whether their argument is NULL
and then return immediately.
 * dev_pm_arm_wake_irq
 * dev_pm_disarm_wake_irq
 * wakeup_source_unregister

Thus the test around the calls is not needed.

This issue was detected by using the Coccinelle software.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
Acked-by: Pavel Machek <pavel@ucw.cz>
[ rjw: Minor whitespace adjustments ]
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
drivers/base/power/wakeup.c

index 5fb7718f256cf9d7bd45229dcc6e8a0b2225b1c5..62e4de2aa8d159222bbfce1b7c498a311eace2cb 100644 (file)
@@ -334,10 +334,9 @@ void device_wakeup_arm_wake_irqs(void)
        struct wakeup_source *ws;
 
        rcu_read_lock();
-       list_for_each_entry_rcu(ws, &wakeup_sources, entry) {
-               if (ws->wakeirq)
-                       dev_pm_arm_wake_irq(ws->wakeirq);
-       }
+       list_for_each_entry_rcu(ws, &wakeup_sources, entry)
+               dev_pm_arm_wake_irq(ws->wakeirq);
+
        rcu_read_unlock();
 }
 
@@ -351,10 +350,9 @@ void device_wakeup_disarm_wake_irqs(void)
        struct wakeup_source *ws;
 
        rcu_read_lock();
-       list_for_each_entry_rcu(ws, &wakeup_sources, entry) {
-               if (ws->wakeirq)
-                       dev_pm_disarm_wake_irq(ws->wakeirq);
-       }
+       list_for_each_entry_rcu(ws, &wakeup_sources, entry)
+               dev_pm_disarm_wake_irq(ws->wakeirq);
+
        rcu_read_unlock();
 }
 
@@ -390,9 +388,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);