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

Commit 3e08b2df authored by Viresh Kumar's avatar Viresh Kumar Committed by Eduardo Valentin
Browse files

thermal: cpu_cooling: remove cpufreq_cooling_get_level() 



There is only one user of cpufreq_cooling_get_level() and that already
has pointer to the cpufreq_cdev structure. It can directly call
get_level() instead and we can get rid of cpufreq_cooling_get_level().

Signed-off-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Reviewed-by: default avatarLukasz Luba <lukasz.luba@arm.com>
Tested-by: default avatarLukasz Luba <lukasz.luba@arm.com>
Signed-off-by: default avatarEduardo Valentin <edubezval@gmail.com>
parent 04bdbdf9

drivers/thermal/cpu_cooling.c

+1 −32
Original line number Diff line number Diff line
@@ -135,37 +135,6 @@ static unsigned long get_level(struct cpufreq_cooling_device *cpufreq_cdev, 
	return THERMAL_CSTATE_INVALID;

}



/**

 * cpufreq_cooling_get_level - for a given cpu, return the cooling level.

 * @cpu: cpu for which the level is required

 * @freq: the frequency of interest

 *

 * This function will match the cooling level corresponding to the

 * requested @freq and return it.

 *

 * Return: The matched cooling level on success or THERMAL_CSTATE_INVALID

 * otherwise.

 */

unsigned long cpufreq_cooling_get_level(unsigned int cpu, unsigned int freq)

{

	struct cpufreq_cooling_device *cpufreq_cdev;



	mutex_lock(&cooling_list_lock);

	list_for_each_entry(cpufreq_cdev, &cpufreq_cdev_list, node) {

		if (cpumask_test_cpu(cpu, &cpufreq_cdev->allowed_cpus)) {

			unsigned long level = get_level(cpufreq_cdev, freq);



			mutex_unlock(&cooling_list_lock);

			return level;

		}

	}

	mutex_unlock(&cooling_list_lock);



	pr_err("%s: cpu:%d not part of any cooling device\n", __func__, cpu);

	return THERMAL_CSTATE_INVALID;

}

EXPORT_SYMBOL_GPL(cpufreq_cooling_get_level);



/**

 * cpufreq_thermal_notifier - notifier callback for cpufreq policy change.

 * @nb:	struct notifier_block * with callback info.
@@ -697,7 +666,7 @@ static int cpufreq_power2state(struct thermal_cooling_device *cdev, 
	normalised_power = (dyn_power * 100) / last_load;

	target_freq = cpu_power_to_freq(cpufreq_cdev, normalised_power);



	*state = cpufreq_cooling_get_level(cpu, target_freq);

	*state = get_level(cpufreq_cdev, target_freq);

	if (*state == THERMAL_CSTATE_INVALID) {

		dev_err_ratelimited(&cdev->device,

				    "Failed to convert %dKHz for cpu %d into a cdev state\n",

include/linux/cpu_cooling.h

+0 −6
Original line number Diff line number Diff line
@@ -82,7 +82,6 @@ of_cpufreq_power_cooling_register(struct device_node *np, 
 */

void cpufreq_cooling_unregister(struct thermal_cooling_device *cdev);



unsigned long cpufreq_cooling_get_level(unsigned int cpu, unsigned int freq);

#else /* !CONFIG_CPU_THERMAL */

static inline struct thermal_cooling_device *

cpufreq_cooling_register(const struct cpumask *clip_cpus)
@@ -117,11 +116,6 @@ void cpufreq_cooling_unregister(struct thermal_cooling_device *cdev) 
{

	return;

}

static inline

unsigned long cpufreq_cooling_get_level(unsigned int cpu, unsigned int freq)

{

	return THERMAL_CSTATE_INVALID;

}

#endif	/* CONFIG_CPU_THERMAL */



#endif /* __CPU_COOLING_H__ */