leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cpufreq: Replace deprecated CPU-hotplug functions

Browse Source 
The functions get_online_cpus() and put_online_cpus() have been
deprecated during the CPU hotplug rework. They map directly to
cpus_read_lock() and cpus_read_unlock().

Replace deprecated CPU-hotplug functions with the official version.
The behavior remains unchanged.

Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
Sebastian Andrzej Siewior
2021-08-03 16:16:11 +02:00
committed by Rafael J. Wysocki
parent c500bee1c5
commit 09681a0772
6 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/cpufreq/acpi-cpufreq.c
View File

@@ -163,9 +163,9 @@ static ssize_t store_cpb(struct cpufreq_policy *policy, const char *buf,
if (ret || val > 1) if (ret || val > 1)
return -EINVAL; return -EINVAL;
get_online_cpus(); cpus_read_lock();
set_boost(policy, val); set_boost(policy, val);
put_online_cpus(); cpus_read_unlock();
return count; return count;
} }

6
drivers/cpufreq/cpufreq.c
View File

@@ -2654,18 +2654,18 @@ int cpufreq_boost_trigger_state(int state)
cpufreq_driver->boost_enabled = state; cpufreq_driver->boost_enabled = state;
write_unlock_irqrestore(&cpufreq_driver_lock, flags); write_unlock_irqrestore(&cpufreq_driver_lock, flags);
get_online_cpus(); cpus_read_lock();
for_each_active_policy(policy) { for_each_active_policy(policy) {
ret = cpufreq_driver->set_boost(policy, state); ret = cpufreq_driver->set_boost(policy, state);
if (ret) if (ret)
goto err_reset_state; goto err_reset_state;
} }
put_online_cpus(); cpus_read_unlock();
return 0; return 0;
err_reset_state: err_reset_state:
put_online_cpus(); cpus_read_unlock();
write_lock_irqsave(&cpufreq_driver_lock, flags); write_lock_irqsave(&cpufreq_driver_lock, flags);
cpufreq_driver->boost_enabled = !state; cpufreq_driver->boost_enabled = !state;

4
drivers/cpufreq/cpufreq_ondemand.c
View File

@@ -418,7 +418,7 @@ static void od_set_powersave_bias(unsigned int powersave_bias)
default_powersave_bias = powersave_bias; default_powersave_bias = powersave_bias;
cpumask_clear(&done); cpumask_clear(&done);
get_online_cpus(); cpus_read_lock();
for_each_online_cpu(cpu) { for_each_online_cpu(cpu) {
struct cpufreq_policy *policy; struct cpufreq_policy *policy;
struct policy_dbs_info *policy_dbs; struct policy_dbs_info *policy_dbs;
@@ -442,7 +442,7 @@ static void od_set_powersave_bias(unsigned int powersave_bias)
od_tuners = dbs_data->tuners; od_tuners = dbs_data->tuners;
od_tuners->powersave_bias = default_powersave_bias; od_tuners->powersave_bias = default_powersave_bias;
} }
put_online_cpus(); cpus_read_unlock();
} }
void od_register_powersave_bias_handler(unsigned int (*f) void od_register_powersave_bias_handler(unsigned int (*f)

4
drivers/cpufreq/intel_pstate.c
View File

@@ -2969,7 +2969,7 @@ static void intel_pstate_driver_cleanup(void)
{ {
unsigned int cpu; unsigned int cpu;
get_online_cpus(); cpus_read_lock();
for_each_online_cpu(cpu) { for_each_online_cpu(cpu) {
if (all_cpu_data[cpu]) { if (all_cpu_data[cpu]) {
if (intel_pstate_driver == &intel_pstate) if (intel_pstate_driver == &intel_pstate)
@@ -2979,7 +2979,7 @@ static void intel_pstate_driver_cleanup(void)
all_cpu_data[cpu] = NULL; all_cpu_data[cpu] = NULL;
} }
} }
put_online_cpus(); cpus_read_unlock();
intel_pstate_driver = NULL; intel_pstate_driver = NULL;
} }

6
drivers/cpufreq/powernow-k8.c
View File

@@ -1180,7 +1180,7 @@ static int powernowk8_init(void)
if (!x86_match_cpu(powernow_k8_ids)) if (!x86_match_cpu(powernow_k8_ids))
return -ENODEV; return -ENODEV;
get_online_cpus(); cpus_read_lock();
for_each_online_cpu(i) { for_each_online_cpu(i) {
smp_call_function_single(i, check_supported_cpu, &ret, 1); smp_call_function_single(i, check_supported_cpu, &ret, 1);
if (!ret) if (!ret)
@@ -1188,10 +1188,10 @@ static int powernowk8_init(void)
} }
if (supported_cpus != num_online_cpus()) { if (supported_cpus != num_online_cpus()) {
put_online_cpus(); cpus_read_unlock();
return -ENODEV; return -ENODEV;
} }
put_online_cpus(); cpus_read_unlock();
ret = cpufreq_register_driver(&cpufreq_amd64_driver); ret = cpufreq_register_driver(&cpufreq_amd64_driver);
if (ret) if (ret)

4
drivers/cpufreq/powernv-cpufreq.c
View File

@@ -918,7 +918,7 @@ static void powernv_cpufreq_work_fn(struct work_struct *work)
unsigned int cpu; unsigned int cpu;
cpumask_t mask; cpumask_t mask;
get_online_cpus(); cpus_read_lock();
cpumask_and(&mask, &chip->mask, cpu_online_mask); cpumask_and(&mask, &chip->mask, cpu_online_mask);
smp_call_function_any(&mask, smp_call_function_any(&mask,
powernv_cpufreq_throttle_check, NULL, 0); powernv_cpufreq_throttle_check, NULL, 0);
@@ -939,7 +939,7 @@ static void powernv_cpufreq_work_fn(struct work_struct *work)
cpufreq_cpu_put(policy); cpufreq_cpu_put(policy);
} }
out: out:
put_online_cpus(); cpus_read_unlock();
} }
static int powernv_cpufreq_occ_msg(struct notifier_block *nb, static int powernv_cpufreq_occ_msg(struct notifier_block *nb,