android/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

thermal: cpu_cooling: Remove usage of devm functions

Browse Source 
In the function cpufreq_get_requested_power, the memory allocated
for load_cpu is live within the function only. And after the
allocation it is immediately freed with devm_kfree. There is no
need to allocate memory for load_cpu with devm function so replace
devm_kcalloc with kcalloc and devm_kfree with kfree.

Signed-off-by: Vaishali Thakkar <vthakkar1994@gmail.com>
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
Acked-by: Javi Merino <javi.merino@arm.com>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
This commit is contained in:
Vaishali Thakkar 2015-08-19 11:52:19 +05:30 committed by Zhang Rui
parent 049e6dde7e
commit a71544cd93
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/thermal/cpu_cooling.c
View File

@ -591,8 +591,7 @@ static int cpufreq_get_requested_power(struct thermal_cooling_device *cdev,
if (trace_thermal_power_cpu_get_power_enabled()) { if (trace_thermal_power_cpu_get_power_enabled()) {
u32 ncpus = cpumask_weight(&cpufreq_device->allowed_cpus); u32 ncpus = cpumask_weight(&cpufreq_device->allowed_cpus);
load_cpu = devm_kcalloc(&cdev->device, ncpus, sizeof(*load_cpu), load_cpu = kcalloc(ncpus, sizeof(*load_cpu), GFP_KERNEL);
GFP_KERNEL);
} }
for_each_cpu(cpu, &cpufreq_device->allowed_cpus) { for_each_cpu(cpu, &cpufreq_device->allowed_cpus) {
@ -615,8 +614,7 @@ static int cpufreq_get_requested_power(struct thermal_cooling_device *cdev,
dynamic_power = get_dynamic_power(cpufreq_device, freq); dynamic_power = get_dynamic_power(cpufreq_device, freq);
ret = get_static_power(cpufreq_device, tz, freq, &static_power); ret = get_static_power(cpufreq_device, tz, freq, &static_power);
if (ret) { if (ret) {
if (load_cpu) kfree(load_cpu);
devm_kfree(&cdev->device, load_cpu);
return ret; return ret;
} }
@ -625,7 +623,7 @@ static int cpufreq_get_requested_power(struct thermal_cooling_device *cdev,
&cpufreq_device->allowed_cpus, &cpufreq_device->allowed_cpus,
freq, load_cpu, i, dynamic_power, static_power); freq, load_cpu, i, dynamic_power, static_power);
devm_kfree(&cdev->device, load_cpu); kfree(load_cpu);
} }
*power = static_power + dynamic_power; *power = static_power + dynamic_power;