diff options
author | Sebastian Andrzej Siewior <bigeasy@linutronix.de> | 2018-05-25 06:19:58 -0400 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2018-05-30 05:16:59 -0400 |
commit | cc85de361d99490df182e63d13f409054a579a13 (patch) | |
tree | e25832af936e4dc7e4a0c13da67f44f6f540eff2 | |
parent | 9c80172b902db58233346adbb139cfdcb9229f0f (diff) |
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>
-rw-r--r-- | drivers/cpufreq/cpufreq.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c index 82123a138576..b0dfd3222013 100644 --- a/drivers/cpufreq/cpufreq.c +++ b/drivers/cpufreq/cpufreq.c | |||
@@ -89,16 +89,7 @@ static void cpufreq_governor_limits(struct cpufreq_policy *policy); | |||
89 | * The mutex locks both lists. | 89 | * The mutex locks both lists. |
90 | */ | 90 | */ |
91 | static BLOCKING_NOTIFIER_HEAD(cpufreq_policy_notifier_list); | 91 | static BLOCKING_NOTIFIER_HEAD(cpufreq_policy_notifier_list); |
92 | static struct srcu_notifier_head cpufreq_transition_notifier_list; | 92 | SRCU_NOTIFIER_HEAD_STATIC(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); | ||
102 | 93 | ||
103 | static int off __read_mostly; | 94 | static int off __read_mostly; |
104 | static int cpufreq_disabled(void) | 95 | static int cpufreq_disabled(void) |
@@ -1767,8 +1758,6 @@ int cpufreq_register_notifier(struct notifier_block *nb, unsigned int list) | |||
1767 | if (cpufreq_disabled()) | 1758 | if (cpufreq_disabled()) |
1768 | return -EINVAL; | 1759 | return -EINVAL; |
1769 | 1760 | ||
1770 | WARN_ON(!init_cpufreq_transition_notifier_list_called); | ||
1771 | |||
1772 | switch (list) { | 1761 | switch (list) { |
1773 | case CPUFREQ_TRANSITION_NOTIFIER: | 1762 | case CPUFREQ_TRANSITION_NOTIFIER: |
1774 | mutex_lock(&cpufreq_fast_switch_lock); | 1763 | mutex_lock(&cpufreq_fast_switch_lock); |