Skip to content

Commit 5da7af9

Browse files
Amit Kucheriarafaeljw
authored andcommitted
cpufreq: scmi: 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 17170ec commit 5da7af9

File tree

1 file changed

+2
-12
lines changed

1 file changed

+2
-12
lines changed

drivers/cpufreq/scmi-cpufreq.c

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
#include <linux/cpu.h>
1212
#include <linux/cpufreq.h>
1313
#include <linux/cpumask.h>
14-
#include <linux/cpu_cooling.h>
1514
#include <linux/export.h>
1615
#include <linux/module.h>
1716
#include <linux/pm_opp.h>
@@ -22,7 +21,6 @@
2221
struct scmi_data {
2322
int domain_id;
2423
struct device *cpu_dev;
25-
struct thermal_cooling_device *cdev;
2624
};
2725

2826
static const struct scmi_handle *handle;
@@ -185,33 +183,25 @@ static int scmi_cpufreq_exit(struct cpufreq_policy *policy)
185183
{
186184
struct scmi_data *priv = policy->driver_data;
187185

188-
cpufreq_cooling_unregister(priv->cdev);
189186
dev_pm_opp_free_cpufreq_table(priv->cpu_dev, &policy->freq_table);
190187
kfree(priv);
191188
dev_pm_opp_remove_all_dynamic(priv->cpu_dev);
192189

193190
return 0;
194191
}
195192

196-
static void scmi_cpufreq_ready(struct cpufreq_policy *policy)
197-
{
198-
struct scmi_data *priv = policy->driver_data;
199-
200-
priv->cdev = of_cpufreq_cooling_register(policy);
201-
}
202-
203193
static struct cpufreq_driver scmi_cpufreq_driver = {
204194
.name = "scmi",
205195
.flags = CPUFREQ_STICKY | CPUFREQ_HAVE_GOVERNOR_PER_POLICY |
206-
CPUFREQ_NEED_INITIAL_FREQ_CHECK,
196+
CPUFREQ_NEED_INITIAL_FREQ_CHECK |
197+
CPUFREQ_IS_COOLING_DEV,
207198
.verify = cpufreq_generic_frequency_table_verify,
208199
.attr = cpufreq_generic_attr,
209200
.target_index = scmi_cpufreq_set_target,
210201
.fast_switch = scmi_cpufreq_fast_switch,
211202
.get = scmi_cpufreq_get_rate,
212203
.init = scmi_cpufreq_init,
213204
.exit = scmi_cpufreq_exit,
214-
.ready = scmi_cpufreq_ready,
215205
};
216206

217207
static int scmi_cpufreq_probe(struct scmi_device *sdev)

0 commit comments

Comments
 (0)