Skip to content

Commit cc85de3

Browse files
Sebastian Andrzej Siewiorrafaeljw
authored andcommitted
cpufreq: Use static SRCU initializer
Use the static SRCU initializer for `cpufreq_transition_notifier_list'. This avoids the init_cpufreq_transition_notifier_list() initcall. Its only purpose is to initialize the SRCU notifier once during boot and set another variable which is used as an indicator whether the init was perfromed before cpufreq_register_notifier() was used. Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Acked-by: Viresh Kumar <viresh.kumar@linaro.org> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
1 parent 9c80172 commit cc85de3

File tree

1 file changed

+1
-12
lines changed

1 file changed

+1
-12
lines changed

drivers/cpufreq/cpufreq.c

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -89,16 +89,7 @@ static void cpufreq_governor_limits(struct cpufreq_policy *policy);
8989
* The mutex locks both lists.
9090
*/
9191
static BLOCKING_NOTIFIER_HEAD(cpufreq_policy_notifier_list);
92-
static struct srcu_notifier_head cpufreq_transition_notifier_list;
93-
94-
static bool init_cpufreq_transition_notifier_list_called;
95-
static int __init init_cpufreq_transition_notifier_list(void)
96-
{
97-
srcu_init_notifier_head(&cpufreq_transition_notifier_list);
98-
init_cpufreq_transition_notifier_list_called = true;
99-
return 0;
100-
}
101-
pure_initcall(init_cpufreq_transition_notifier_list);
92+
SRCU_NOTIFIER_HEAD_STATIC(cpufreq_transition_notifier_list);
10293

10394
static int off __read_mostly;
10495
static int cpufreq_disabled(void)
@@ -1767,8 +1758,6 @@ int cpufreq_register_notifier(struct notifier_block *nb, unsigned int list)
17671758
if (cpufreq_disabled())
17681759
return -EINVAL;
17691760

1770-
WARN_ON(!init_cpufreq_transition_notifier_list_called);
1771-
17721761
switch (list) {
17731762
case CPUFREQ_TRANSITION_NOTIFIER:
17741763
mutex_lock(&cpufreq_fast_switch_lock);

0 commit comments

Comments
 (0)