Browse Source

cpufreq: ia64: remove redundant freq_table of acpi_cpufreq_data

freq_table is now stored as policy->freq_table, so drop the redundant
freq_table from struct cpufreq_acpi_io.

Signed-off-by: Pan Xinhui <xinhuix.pan@intel.com>
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Pan Xinhui 10 years ago
parent
commit
946c14f812
1 changed files with 7 additions and 7 deletions
  1. 7 7
      drivers/cpufreq/ia64-acpi-cpufreq.c

+ 7 - 7
drivers/cpufreq/ia64-acpi-cpufreq.c

@@ -29,7 +29,6 @@ MODULE_LICENSE("GPL");
 
 
 struct cpufreq_acpi_io {
 struct cpufreq_acpi_io {
 	struct acpi_processor_performance	acpi_data;
 	struct acpi_processor_performance	acpi_data;
-	struct cpufreq_frequency_table		*freq_table;
 	unsigned int				resume;
 	unsigned int				resume;
 };
 };
 
 
@@ -221,6 +220,7 @@ acpi_cpufreq_cpu_init (
 	unsigned int		cpu = policy->cpu;
 	unsigned int		cpu = policy->cpu;
 	struct cpufreq_acpi_io	*data;
 	struct cpufreq_acpi_io	*data;
 	unsigned int		result = 0;
 	unsigned int		result = 0;
+	struct cpufreq_frequency_table *freq_table;
 
 
 	pr_debug("acpi_cpufreq_cpu_init\n");
 	pr_debug("acpi_cpufreq_cpu_init\n");
 
 
@@ -254,10 +254,10 @@ acpi_cpufreq_cpu_init (
 	}
 	}
 
 
 	/* alloc freq_table */
 	/* alloc freq_table */
-	data->freq_table = kzalloc(sizeof(*data->freq_table) *
+	freq_table = kzalloc(sizeof(*freq_table) *
 	                           (data->acpi_data.state_count + 1),
 	                           (data->acpi_data.state_count + 1),
 	                           GFP_KERNEL);
 	                           GFP_KERNEL);
-	if (!data->freq_table) {
+	if (!freq_table) {
 		result = -ENOMEM;
 		result = -ENOMEM;
 		goto err_unreg;
 		goto err_unreg;
 	}
 	}
@@ -276,14 +276,14 @@ acpi_cpufreq_cpu_init (
 	for (i = 0; i <= data->acpi_data.state_count; i++)
 	for (i = 0; i <= data->acpi_data.state_count; i++)
 	{
 	{
 		if (i < data->acpi_data.state_count) {
 		if (i < data->acpi_data.state_count) {
-			data->freq_table[i].frequency =
+			freq_table[i].frequency =
 			      data->acpi_data.states[i].core_frequency * 1000;
 			      data->acpi_data.states[i].core_frequency * 1000;
 		} else {
 		} else {
-			data->freq_table[i].frequency = CPUFREQ_TABLE_END;
+			freq_table[i].frequency = CPUFREQ_TABLE_END;
 		}
 		}
 	}
 	}
 
 
-	result = cpufreq_table_validate_and_show(policy, data->freq_table);
+	result = cpufreq_table_validate_and_show(policy, freq_table);
 	if (result) {
 	if (result) {
 		goto err_freqfree;
 		goto err_freqfree;
 	}
 	}
@@ -311,7 +311,7 @@ acpi_cpufreq_cpu_init (
 	return (result);
 	return (result);
 
 
  err_freqfree:
  err_freqfree:
-	kfree(data->freq_table);
+	kfree(freq_table);
  err_unreg:
  err_unreg:
 	acpi_processor_unregister_performance(cpu);
 	acpi_processor_unregister_performance(cpu);
  err_free:
  err_free: