diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-03-19 10:20:27 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-03-19 10:20:27 +0100 |
| commit | 99917e37b9e78b96af304ddeb4f9b82a5948bbd9 (patch) | |
| tree | dbed27d4dd7b0a2d73dc3639fb56389c5e45c079 /drivers/base | |
| parent | 8ba88804bb3b877c841bc1864a8605111580cd0b (diff) | |
| download | linux-99917e37b9e78b96af304ddeb4f9b82a5948bbd9.tar.gz linux-99917e37b9e78b96af304ddeb4f9b82a5948bbd9.tar.bz2 linux-99917e37b9e78b96af304ddeb4f9b82a5948bbd9.zip | |
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" <rjw@rjwysocki.net>
Cc: Madhuparna Bhowmik <madhuparnabhowmik10@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/base')
| -rw-r--r-- | drivers/base/power/wakeup.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/drivers/base/power/wakeup.c b/drivers/base/power/wakeup.c index d9fefc65ac34..27f3e60608e5 100644 --- 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; } |