mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-11 04:18:39 +08:00
ACPI / processor: Drop an unused argument of a cleanup routine
acpi_processor_unregister_performance() actually doesn't use its first argument, so drop it and update the callers accordingly. Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
This commit is contained in:
parent
4bc384ae62
commit
b2f8dc4ce6
@ -784,9 +784,7 @@ acpi_processor_register_performance(struct acpi_processor_performance
|
||||
|
||||
EXPORT_SYMBOL(acpi_processor_register_performance);
|
||||
|
||||
void
|
||||
acpi_processor_unregister_performance(struct acpi_processor_performance
|
||||
*performance, unsigned int cpu)
|
||||
void acpi_processor_unregister_performance(unsigned int cpu)
|
||||
{
|
||||
struct acpi_processor *pr;
|
||||
|
||||
|
@ -844,7 +844,7 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy)
|
||||
err_freqfree:
|
||||
kfree(data->freq_table);
|
||||
err_unreg:
|
||||
acpi_processor_unregister_performance(perf, cpu);
|
||||
acpi_processor_unregister_performance(cpu);
|
||||
err_free_mask:
|
||||
free_cpumask_var(data->freqdomain_cpus);
|
||||
err_free:
|
||||
@ -862,8 +862,7 @@ static int acpi_cpufreq_cpu_exit(struct cpufreq_policy *policy)
|
||||
|
||||
if (data) {
|
||||
policy->driver_data = NULL;
|
||||
acpi_processor_unregister_performance(data->acpi_data,
|
||||
data->acpi_perf_cpu);
|
||||
acpi_processor_unregister_performance(data->acpi_perf_cpu);
|
||||
free_cpumask_var(data->freqdomain_cpus);
|
||||
kfree(data->freq_table);
|
||||
kfree(data);
|
||||
|
@ -78,7 +78,7 @@ static int eps_acpi_init(void)
|
||||
static int eps_acpi_exit(struct cpufreq_policy *policy)
|
||||
{
|
||||
if (eps_acpi_cpu_perf) {
|
||||
acpi_processor_unregister_performance(eps_acpi_cpu_perf, 0);
|
||||
acpi_processor_unregister_performance(0);
|
||||
free_cpumask_var(eps_acpi_cpu_perf->shared_cpu_map);
|
||||
kfree(eps_acpi_cpu_perf);
|
||||
eps_acpi_cpu_perf = NULL;
|
||||
|
@ -313,7 +313,7 @@ acpi_cpufreq_cpu_init (
|
||||
err_freqfree:
|
||||
kfree(data->freq_table);
|
||||
err_unreg:
|
||||
acpi_processor_unregister_performance(&data->acpi_data, cpu);
|
||||
acpi_processor_unregister_performance(cpu);
|
||||
err_free:
|
||||
kfree(data);
|
||||
acpi_io_data[cpu] = NULL;
|
||||
@ -332,8 +332,7 @@ acpi_cpufreq_cpu_exit (
|
||||
|
||||
if (data) {
|
||||
acpi_io_data[policy->cpu] = NULL;
|
||||
acpi_processor_unregister_performance(&data->acpi_data,
|
||||
policy->cpu);
|
||||
acpi_processor_unregister_performance(policy->cpu);
|
||||
kfree(data);
|
||||
}
|
||||
|
||||
|
@ -421,7 +421,7 @@ static int powernow_acpi_init(void)
|
||||
return 0;
|
||||
|
||||
err2:
|
||||
acpi_processor_unregister_performance(acpi_processor_perf, 0);
|
||||
acpi_processor_unregister_performance(0);
|
||||
err1:
|
||||
free_cpumask_var(acpi_processor_perf->shared_cpu_map);
|
||||
err05:
|
||||
@ -661,7 +661,7 @@ static int powernow_cpu_exit(struct cpufreq_policy *policy)
|
||||
{
|
||||
#ifdef CONFIG_X86_POWERNOW_K7_ACPI
|
||||
if (acpi_processor_perf) {
|
||||
acpi_processor_unregister_performance(acpi_processor_perf, 0);
|
||||
acpi_processor_unregister_performance(0);
|
||||
free_cpumask_var(acpi_processor_perf->shared_cpu_map);
|
||||
kfree(acpi_processor_perf);
|
||||
}
|
||||
|
@ -795,7 +795,7 @@ err_out_mem:
|
||||
kfree(powernow_table);
|
||||
|
||||
err_out:
|
||||
acpi_processor_unregister_performance(&data->acpi_data, data->cpu);
|
||||
acpi_processor_unregister_performance(data->cpu);
|
||||
|
||||
/* data->acpi_data.state_count informs us at ->exit()
|
||||
* whether ACPI was used */
|
||||
@ -863,8 +863,7 @@ static int fill_powernow_table_fidvid(struct powernow_k8_data *data,
|
||||
static void powernow_k8_cpu_exit_acpi(struct powernow_k8_data *data)
|
||||
{
|
||||
if (data->acpi_data.state_count)
|
||||
acpi_processor_unregister_performance(&data->acpi_data,
|
||||
data->cpu);
|
||||
acpi_processor_unregister_performance(data->cpu);
|
||||
free_cpumask_var(data->acpi_data.shared_cpu_map);
|
||||
}
|
||||
|
||||
|
@ -560,11 +560,9 @@ static int __init xen_acpi_processor_init(void)
|
||||
|
||||
return 0;
|
||||
err_unregister:
|
||||
for_each_possible_cpu(i) {
|
||||
struct acpi_processor_performance *perf;
|
||||
perf = per_cpu_ptr(acpi_perf_data, i);
|
||||
acpi_processor_unregister_performance(perf, i);
|
||||
}
|
||||
for_each_possible_cpu(i)
|
||||
acpi_processor_unregister_performance(i);
|
||||
|
||||
err_out:
|
||||
/* Freeing a NULL pointer is OK: alloc_percpu zeroes. */
|
||||
free_acpi_perf_data();
|
||||
@ -579,11 +577,9 @@ static void __exit xen_acpi_processor_exit(void)
|
||||
kfree(acpi_ids_done);
|
||||
kfree(acpi_id_present);
|
||||
kfree(acpi_id_cst_present);
|
||||
for_each_possible_cpu(i) {
|
||||
struct acpi_processor_performance *perf;
|
||||
perf = per_cpu_ptr(acpi_perf_data, i);
|
||||
acpi_processor_unregister_performance(perf, i);
|
||||
}
|
||||
for_each_possible_cpu(i)
|
||||
acpi_processor_unregister_performance(i);
|
||||
|
||||
free_acpi_perf_data();
|
||||
}
|
||||
|
||||
|
@ -228,10 +228,7 @@ extern int acpi_processor_preregister_performance(struct
|
||||
|
||||
extern int acpi_processor_register_performance(struct acpi_processor_performance
|
||||
*performance, unsigned int cpu);
|
||||
extern void acpi_processor_unregister_performance(struct
|
||||
acpi_processor_performance
|
||||
*performance,
|
||||
unsigned int cpu);
|
||||
extern void acpi_processor_unregister_performance(unsigned int cpu);
|
||||
|
||||
/* note: this locks both the calling module and the processor module
|
||||
if a _PPC object exists, rmmod is disallowed then */
|
||||
|
Loading…
Reference in New Issue
Block a user