Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

+5 -10
+5 -10
drivers/base/power/wakeup.c
··· 405 405 int srcuidx; 406 406 407 407 srcuidx = srcu_read_lock(&wakeup_srcu); 408 - list_for_each_entry_rcu(ws, &wakeup_sources, entry, 409 - srcu_read_lock_held(&wakeup_srcu)) 408 + list_for_each_entry_rcu(ws, &wakeup_sources, entry) 410 409 dev_pm_arm_wake_irq(ws->wakeirq); 411 410 srcu_read_unlock(&wakeup_srcu, srcuidx); 412 411 } ··· 421 422 int srcuidx; 422 423 423 424 srcuidx = srcu_read_lock(&wakeup_srcu); 424 - list_for_each_entry_rcu(ws, &wakeup_sources, entry, 425 - srcu_read_lock_held(&wakeup_srcu)) 425 + list_for_each_entry_rcu(ws, &wakeup_sources, entry) 426 426 dev_pm_disarm_wake_irq(ws->wakeirq); 427 427 srcu_read_unlock(&wakeup_srcu, srcuidx); 428 428 } ··· 874 876 struct wakeup_source *last_activity_ws = NULL; 875 877 876 878 srcuidx = srcu_read_lock(&wakeup_srcu); 877 - list_for_each_entry_rcu(ws, &wakeup_sources, entry, 878 - srcu_read_lock_held(&wakeup_srcu)) { 879 + list_for_each_entry_rcu(ws, &wakeup_sources, entry) { 879 880 if (ws->active) { 880 881 pm_pr_dbg("active wakeup source: %s\n", ws->name); 881 882 active = 1; ··· 1025 1028 int srcuidx; 1026 1029 1027 1030 srcuidx = srcu_read_lock(&wakeup_srcu); 1028 - list_for_each_entry_rcu(ws, &wakeup_sources, entry, 1029 - srcu_read_lock_held(&wakeup_srcu)) { 1031 + list_for_each_entry_rcu(ws, &wakeup_sources, entry) { 1030 1032 spin_lock_irq(&ws->lock); 1031 1033 if (ws->autosleep_enabled != set) { 1032 1034 ws->autosleep_enabled = set; ··· 1104 1108 } 1105 1109 1106 1110 *srcuidx = srcu_read_lock(&wakeup_srcu); 1107 - list_for_each_entry_rcu(ws, &wakeup_sources, entry, 1108 - srcu_read_lock_held(&wakeup_srcu)) { 1111 + list_for_each_entry_rcu(ws, &wakeup_sources, entry) { 1109 1112 if (n-- <= 0) 1110 1113 return ws; 1111 1114 }