Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a71544cd authored by Vaishali Thakkar's avatar Vaishali Thakkar Committed by Zhang Rui
Browse files

thermal: cpu_cooling: Remove usage of devm functions 



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: default avatarVaishali Thakkar <vthakkar1994@gmail.com>
Acked-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Acked-by: default avatarJavi Merino <javi.merino@arm.com>
Signed-off-by: default avatarZhang Rui <rui.zhang@intel.com>
parent 049e6dde

drivers/thermal/cpu_cooling.c

+3 −5
Original line number Diff line number Diff line
@@ -591,8 +591,7 @@ static int cpufreq_get_requested_power(struct thermal_cooling_device *cdev, 
	if (trace_thermal_power_cpu_get_power_enabled()) {

		u32 ncpus = cpumask_weight(&cpufreq_device->allowed_cpus);



		load_cpu = devm_kcalloc(&cdev->device, ncpus, sizeof(*load_cpu),

					GFP_KERNEL);

		load_cpu = kcalloc(ncpus, sizeof(*load_cpu), GFP_KERNEL);

	}



	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);

	ret = get_static_power(cpufreq_device, tz, freq, &static_power);

	if (ret) {

		if (load_cpu)

			devm_kfree(&cdev->device, load_cpu);

		kfree(load_cpu);

		return ret;

	}
@@ -625,7 +623,7 @@ static int cpufreq_get_requested_power(struct thermal_cooling_device *cdev, 
			&cpufreq_device->allowed_cpus,

			freq, load_cpu, i, dynamic_power, static_power);



		devm_kfree(&cdev->device, load_cpu);

		kfree(load_cpu);

	}



	*power = static_power + dynamic_power;