1 files changed, 7 insertions, 11 deletions

diff --git a/drivers/base/power/wakeup.c b/drivers/base/power/wakeup.c
index 5fb7718f256c..62e4de2aa8d1 100644
--- a/drivers/base/power/wakeup.c
+++ b/drivers/base/power/wakeup.c
@@ -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);