Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ACPI / CPPC: Add prefix cppc to cpudata structure name

Since struct cpudata is defined in a header file, add prefix cppc_ to
make it not a generic name. Otherwise it causes compile issue in locally
define structure with the same name.

Signed-off-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

authored by

Srinivas Pandruvada and committed by
Rafael J. Wysocki
41dd6403 a6cbcdd5

+11 -11
+2 -2
drivers/acpi/cppc_acpi.c
··· 409 409 * 410 410 * Return: 0 for success or negative value for err. 411 411 */ 412 - int acpi_get_psd_map(struct cpudata **all_cpu_data) 412 + int acpi_get_psd_map(struct cppc_cpudata **all_cpu_data) 413 413 { 414 414 int count_target; 415 415 int retval = 0; 416 416 unsigned int i, j; 417 417 cpumask_var_t covered_cpus; 418 - struct cpudata *pr, *match_pr; 418 + struct cppc_cpudata *pr, *match_pr; 419 419 struct acpi_psd_package *pdomain; 420 420 struct acpi_psd_package *match_pdomain; 421 421 struct cpc_desc *cpc_ptr, *match_cpc_ptr;
+7 -7
drivers/cpufreq/cppc_cpufreq.c
··· 30 30 * performance capabilities, desired performance level 31 31 * requested etc. 32 32 */ 33 - static struct cpudata **all_cpu_data; 33 + static struct cppc_cpudata **all_cpu_data; 34 34 35 35 static int cppc_cpufreq_set_target(struct cpufreq_policy *policy, 36 36 unsigned int target_freq, 37 37 unsigned int relation) 38 38 { 39 - struct cpudata *cpu; 39 + struct cppc_cpudata *cpu; 40 40 struct cpufreq_freqs freqs; 41 41 int ret = 0; 42 42 ··· 66 66 static void cppc_cpufreq_stop_cpu(struct cpufreq_policy *policy) 67 67 { 68 68 int cpu_num = policy->cpu; 69 - struct cpudata *cpu = all_cpu_data[cpu_num]; 69 + struct cppc_cpudata *cpu = all_cpu_data[cpu_num]; 70 70 int ret; 71 71 72 72 cpu->perf_ctrls.desired_perf = cpu->perf_caps.lowest_perf; ··· 79 79 80 80 static int cppc_cpufreq_cpu_init(struct cpufreq_policy *policy) 81 81 { 82 - struct cpudata *cpu; 82 + struct cppc_cpudata *cpu; 83 83 unsigned int cpu_num = policy->cpu; 84 84 int ret = 0; 85 85 ··· 135 135 static int __init cppc_cpufreq_init(void) 136 136 { 137 137 int i, ret = 0; 138 - struct cpudata *cpu; 138 + struct cppc_cpudata *cpu; 139 139 140 140 if (acpi_disabled) 141 141 return -ENODEV; ··· 145 145 return -ENOMEM; 146 146 147 147 for_each_possible_cpu(i) { 148 - all_cpu_data[i] = kzalloc(sizeof(struct cpudata), GFP_KERNEL); 148 + all_cpu_data[i] = kzalloc(sizeof(struct cppc_cpudata), GFP_KERNEL); 149 149 if (!all_cpu_data[i]) 150 150 goto out; 151 151 ··· 176 176 177 177 static void __exit cppc_cpufreq_exit(void) 178 178 { 179 - struct cpudata *cpu; 179 + struct cppc_cpudata *cpu; 180 180 int i; 181 181 182 182 cpufreq_unregister_driver(&cppc_cpufreq_driver);
+2 -2
include/acpi/cppc_acpi.h
··· 119 119 }; 120 120 121 121 /* Per CPU container for runtime CPPC management. */ 122 - struct cpudata { 122 + struct cppc_cpudata { 123 123 int cpu; 124 124 struct cppc_perf_caps perf_caps; 125 125 struct cppc_perf_ctrls perf_ctrls; ··· 132 132 extern int cppc_get_perf_ctrs(int cpu, struct cppc_perf_fb_ctrs *perf_fb_ctrs); 133 133 extern int cppc_set_perf(int cpu, struct cppc_perf_ctrls *perf_ctrls); 134 134 extern int cppc_get_perf_caps(int cpu, struct cppc_perf_caps *caps); 135 - extern int acpi_get_psd_map(struct cpudata **); 135 + extern int acpi_get_psd_map(struct cppc_cpudata **); 136 136 extern unsigned int cppc_get_transition_latency(int cpu); 137 137 138 138 #endif /* _CPPC_ACPI_H*/