Skip to content

Commit cb772b8

Browse files
Amit Kucheriarafaeljw
authored andcommitted
cpufreq: scpi: Use auto-registration of thermal cooling device
Use the CPUFREQ_IS_COOLING_DEV flag to allow cpufreq core to automatically register as a thermal cooling device. This allows removal of boiler plate code from the driver. Signed-off-by: Amit Kucheria <amit.kucheria@linaro.org> Acked-by: Sudeep Holla <sudeep.holla@arm.com> Acked-by: Viresh Kumar <viresh.kumar@linaro.org> Reviewed-by: Daniel Lezcano <daniel.lezcano@linaro.org> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
1 parent 5da7af9 commit cb772b8

File tree

1 file changed

+2
-12
lines changed

1 file changed

+2
-12
lines changed

drivers/cpufreq/scpi-cpufreq.c

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
#include <linux/cpu.h>
2323
#include <linux/cpufreq.h>
2424
#include <linux/cpumask.h>
25-
#include <linux/cpu_cooling.h>
2625
#include <linux/export.h>
2726
#include <linux/module.h>
2827
#include <linux/of_platform.h>
@@ -34,7 +33,6 @@
3433
struct scpi_data {
3534
struct clk *clk;
3635
struct device *cpu_dev;
37-
struct thermal_cooling_device *cdev;
3836
};
3937

4038
static struct scpi_ops *scpi_ops;
@@ -186,7 +184,6 @@ static int scpi_cpufreq_exit(struct cpufreq_policy *policy)
186184
{
187185
struct scpi_data *priv = policy->driver_data;
188186

189-
cpufreq_cooling_unregister(priv->cdev);
190187
clk_put(priv->clk);
191188
dev_pm_opp_free_cpufreq_table(priv->cpu_dev, &policy->freq_table);
192189
kfree(priv);
@@ -195,23 +192,16 @@ static int scpi_cpufreq_exit(struct cpufreq_policy *policy)
195192
return 0;
196193
}
197194

198-
static void scpi_cpufreq_ready(struct cpufreq_policy *policy)
199-
{
200-
struct scpi_data *priv = policy->driver_data;
201-
202-
priv->cdev = of_cpufreq_cooling_register(policy);
203-
}
204-
205195
static struct cpufreq_driver scpi_cpufreq_driver = {
206196
.name = "scpi-cpufreq",
207197
.flags = CPUFREQ_STICKY | CPUFREQ_HAVE_GOVERNOR_PER_POLICY |
208-
CPUFREQ_NEED_INITIAL_FREQ_CHECK,
198+
CPUFREQ_NEED_INITIAL_FREQ_CHECK |
199+
CPUFREQ_IS_COOLING_DEV,
209200
.verify = cpufreq_generic_frequency_table_verify,
210201
.attr = cpufreq_generic_attr,
211202
.get = scpi_cpufreq_get_rate,
212203
.init = scpi_cpufreq_init,
213204
.exit = scpi_cpufreq_exit,
214-
.ready = scpi_cpufreq_ready,
215205
.target_index = scpi_cpufreq_set_target,
216206
};
217207

0 commit comments

Comments
 (0)