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

Commit 3ebb62ff authored by Viresh Kumar's avatar Viresh Kumar Committed by Rafael J. Wysocki
Browse files

cpu_cooling: Keep only one of_cpufreq*cooling_register() helper 



of_cpufreq_cooling_register() isn't used by anyone and so can be
removed, but then we would be left with two routines:
cpufreq_cooling_register() and of_cpufreq_power_cooling_register() that
would look odd.

Remove current implementation of of_cpufreq_cooling_register() and
rename of_cpufreq_power_cooling_register() as
of_cpufreq_cooling_register(). This simplifies lots of stuff.

Acked-by: default avatarEduardo Valentin <edubezval@gmail.com>
Signed-off-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent ba0966da

Documentation/thermal/cpu-cooling-api.txt

+3 −11
Original line number Diff line number Diff line
@@ -26,24 +26,16 @@ the user. The registration APIs returns the cooling device pointer. 
   clip_cpus: cpumask of cpus where the frequency constraints will happen.



1.1.2 struct thermal_cooling_device *of_cpufreq_cooling_register(

	struct device_node *np, const struct cpumask *clip_cpus)

					struct cpufreq_policy *policy)



    This interface function registers the cpufreq cooling device with

    the name "thermal-cpufreq-%x" linking it with a device tree node, in

    order to bind it via the thermal DT code. This api can support multiple

    instances of cpufreq cooling devices.



    np: pointer to the cooling device device tree node

    clip_cpus: cpumask of cpus where the frequency constraints will happen.



1.1.3 struct thermal_cooling_device *of_cpufreq_power_cooling_register(

					struct cpufreq_policy *policy)



Similar to cpufreq_cooling_register, this function register a

cpufreq cooling device with power extensions using the device tree

information supplied by the np parameter.

    policy: CPUFreq policy.



1.1.4 void cpufreq_cooling_unregister(struct thermal_cooling_device *cdev)

1.1.3 void cpufreq_cooling_unregister(struct thermal_cooling_device *cdev)



    This interface function unregisters the "thermal-cpufreq-%x" cooling device.

drivers/cpufreq/arm_big_little.c

+1 −1
Original line number Diff line number Diff line
@@ -532,7 +532,7 @@ static void bL_cpufreq_ready(struct cpufreq_policy *policy) 
	if (cur_cluster >= MAX_CLUSTERS)

		return;



	cdev[cur_cluster] = of_cpufreq_power_cooling_register(policy);

	cdev[cur_cluster] = of_cpufreq_cooling_register(policy);

}



static struct cpufreq_driver bL_cpufreq_driver = {

drivers/cpufreq/cpufreq-dt.c

+1 −1
Original line number Diff line number Diff line
@@ -320,7 +320,7 @@ static void cpufreq_ready(struct cpufreq_policy *policy) 
{

	struct private_data *priv = policy->driver_data;



	priv->cdev = of_cpufreq_power_cooling_register(policy);

	priv->cdev = of_cpufreq_cooling_register(policy);

}



static struct cpufreq_driver dt_cpufreq_driver = {

drivers/cpufreq/mediatek-cpufreq.c

+1 −1
Original line number Diff line number Diff line
@@ -311,7 +311,7 @@ static void mtk_cpufreq_ready(struct cpufreq_policy *policy) 
{

	struct mtk_cpu_dvfs_info *info = policy->driver_data;



	info->cdev = of_cpufreq_power_cooling_register(policy);

	info->cdev = of_cpufreq_cooling_register(policy);

}



static int mtk_cpu_dvfs_info_init(struct mtk_cpu_dvfs_info *info, int cpu)

drivers/cpufreq/qoriq-cpufreq.c

+1 −1
Original line number Diff line number Diff line
@@ -276,7 +276,7 @@ static void qoriq_cpufreq_ready(struct cpufreq_policy *policy) 
{

	struct cpu_data *cpud = policy->driver_data;



	cpud->cdev = of_cpufreq_power_cooling_register(policy);

	cpud->cdev = of_cpufreq_cooling_register(policy);

}



static struct cpufreq_driver qoriq_cpufreq_driver = {