Revert "drivers: base: power: wakeup.c: Use built-in RCU list checking"

This reverts commit 8ba88804bb3b877c841bc1864a8605111580cd0b as a better
version is already in Rafael's tree, sorry about that.

Reported-by: "Rafael J. Wysocki" <[email protected]>
Cc: Madhuparna Bhowmik <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

diff --git a/drivers/base/power/wakeup.c b/drivers/base/power/wakeup.c
index d9fefc65ac3485fe3cc31c490ad4bd1a4e80340b..27f3e60608e590d90cbcfaf58f3ca35f0e6dae6e 100644 (file)
--- a/drivers/base/power/wakeup.c
+++ b/drivers/base/power/wakeup.c
@@ -405,8 +405,7 @@ void device_wakeup_arm_wake_irqs(void)
        int srcuidx;
 
        srcuidx = srcu_read_lock(&wakeup_srcu);
-       list_for_each_entry_rcu(ws, &wakeup_sources, entry,
-                               srcu_read_lock_held(&wakeup_srcu))
+       list_for_each_entry_rcu(ws, &wakeup_sources, entry)
                dev_pm_arm_wake_irq(ws->wakeirq);
        srcu_read_unlock(&wakeup_srcu, srcuidx);
 }
@@ -422,8 +421,7 @@ void device_wakeup_disarm_wake_irqs(void)
        int srcuidx;
 
        srcuidx = srcu_read_lock(&wakeup_srcu);
-       list_for_each_entry_rcu(ws, &wakeup_sources, entry,
-                               srcu_read_lock_held(&wakeup_srcu))
+       list_for_each_entry_rcu(ws, &wakeup_sources, entry)
                dev_pm_disarm_wake_irq(ws->wakeirq);
        srcu_read_unlock(&wakeup_srcu, srcuidx);
 }
@@ -876,8 +874,7 @@ void pm_print_active_wakeup_sources(void)
        struct wakeup_source *last_activity_ws = NULL;
 
        srcuidx = srcu_read_lock(&wakeup_srcu);
-       list_for_each_entry_rcu(ws, &wakeup_sources, entry,
-                               srcu_read_lock_held(&wakeup_srcu)) {
+       list_for_each_entry_rcu(ws, &wakeup_sources, entry) {
                if (ws->active) {
                        pm_pr_dbg("active wakeup source: %s\n", ws->name);
                        active = 1;
@@ -1028,8 +1025,7 @@ void pm_wakep_autosleep_enabled(bool set)
        int srcuidx;
 
        srcuidx = srcu_read_lock(&wakeup_srcu);
-       list_for_each_entry_rcu(ws, &wakeup_sources, entry,
-                               srcu_read_lock_held(&wakeup_srcu)) {
+       list_for_each_entry_rcu(ws, &wakeup_sources, entry) {
                spin_lock_irq(&ws->lock);
                if (ws->autosleep_enabled != set) {
                        ws->autosleep_enabled = set;
@@ -1108,8 +1104,7 @@ static void *wakeup_sources_stats_seq_start(struct seq_file *m,
        }
 
        *srcuidx = srcu_read_lock(&wakeup_srcu);
-       list_for_each_entry_rcu(ws, &wakeup_sources, entry,
-                               srcu_read_lock_held(&wakeup_srcu)) {
+       list_for_each_entry_rcu(ws, &wakeup_sources, entry) {
                if (n-- <= 0)
                        return ws;
        }