Commit 99917e37 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

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

This reverts commit 8ba88804 as a better
version is already in Rafael's tree, sorry about that.
Reported-by: default avatar"Rafael J. Wysocki" <rjw@rjwysocki.net>
Cc: Madhuparna Bhowmik <madhuparnabhowmik10@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8ba88804
...@@ -405,8 +405,7 @@ void device_wakeup_arm_wake_irqs(void) ...@@ -405,8 +405,7 @@ void device_wakeup_arm_wake_irqs(void)
int srcuidx; int srcuidx;
srcuidx = srcu_read_lock(&wakeup_srcu); srcuidx = srcu_read_lock(&wakeup_srcu);
list_for_each_entry_rcu(ws, &wakeup_sources, entry, list_for_each_entry_rcu(ws, &wakeup_sources, entry)
srcu_read_lock_held(&wakeup_srcu))
dev_pm_arm_wake_irq(ws->wakeirq); dev_pm_arm_wake_irq(ws->wakeirq);
srcu_read_unlock(&wakeup_srcu, srcuidx); srcu_read_unlock(&wakeup_srcu, srcuidx);
} }
...@@ -422,8 +421,7 @@ void device_wakeup_disarm_wake_irqs(void) ...@@ -422,8 +421,7 @@ void device_wakeup_disarm_wake_irqs(void)
int srcuidx; int srcuidx;
srcuidx = srcu_read_lock(&wakeup_srcu); srcuidx = srcu_read_lock(&wakeup_srcu);
list_for_each_entry_rcu(ws, &wakeup_sources, entry, list_for_each_entry_rcu(ws, &wakeup_sources, entry)
srcu_read_lock_held(&wakeup_srcu))
dev_pm_disarm_wake_irq(ws->wakeirq); dev_pm_disarm_wake_irq(ws->wakeirq);
srcu_read_unlock(&wakeup_srcu, srcuidx); srcu_read_unlock(&wakeup_srcu, srcuidx);
} }
...@@ -876,8 +874,7 @@ void pm_print_active_wakeup_sources(void) ...@@ -876,8 +874,7 @@ void pm_print_active_wakeup_sources(void)
struct wakeup_source *last_activity_ws = NULL; struct wakeup_source *last_activity_ws = NULL;
srcuidx = srcu_read_lock(&wakeup_srcu); srcuidx = srcu_read_lock(&wakeup_srcu);
list_for_each_entry_rcu(ws, &wakeup_sources, entry, list_for_each_entry_rcu(ws, &wakeup_sources, entry) {
srcu_read_lock_held(&wakeup_srcu)) {
if (ws->active) { if (ws->active) {
pm_pr_dbg("active wakeup source: %s\n", ws->name); pm_pr_dbg("active wakeup source: %s\n", ws->name);
active = 1; active = 1;
...@@ -1028,8 +1025,7 @@ void pm_wakep_autosleep_enabled(bool set) ...@@ -1028,8 +1025,7 @@ void pm_wakep_autosleep_enabled(bool set)
int srcuidx; int srcuidx;
srcuidx = srcu_read_lock(&wakeup_srcu); srcuidx = srcu_read_lock(&wakeup_srcu);
list_for_each_entry_rcu(ws, &wakeup_sources, entry, list_for_each_entry_rcu(ws, &wakeup_sources, entry) {
srcu_read_lock_held(&wakeup_srcu)) {
spin_lock_irq(&ws->lock); spin_lock_irq(&ws->lock);
if (ws->autosleep_enabled != set) { if (ws->autosleep_enabled != set) {
ws->autosleep_enabled = set; ws->autosleep_enabled = set;
...@@ -1108,8 +1104,7 @@ static void *wakeup_sources_stats_seq_start(struct seq_file *m, ...@@ -1108,8 +1104,7 @@ static void *wakeup_sources_stats_seq_start(struct seq_file *m,
} }
*srcuidx = srcu_read_lock(&wakeup_srcu); *srcuidx = srcu_read_lock(&wakeup_srcu);
list_for_each_entry_rcu(ws, &wakeup_sources, entry, list_for_each_entry_rcu(ws, &wakeup_sources, entry) {
srcu_read_lock_held(&wakeup_srcu)) {
if (n-- <= 0) if (n-- <= 0)
return ws; return ws;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment