diff options
| author | Rafael J. Wysocki | 2019-02-24 21:18:05 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki | 2019-02-24 21:18:05 +0100 |
| commit | 17162a117cd0733ad1db728fa804e62ded9a87d6 (patch) | |
| tree | 24339c44f10e0d524baabb4bd7535f9dd42ec872 /drivers/cpufreq/qoriq-cpufreq.c | |
| parent | cpufreq: scmi: Fix use-after-free in scmi_cpufreq_exit() (diff) | |
| parent | cpufreq: acpi-cpufreq: Report if CPU doesn't support boost technologies (diff) | |
| download | kernel-qcow2-linux-17162a117cd0733ad1db728fa804e62ded9a87d6.tar.gz kernel-qcow2-linux-17162a117cd0733ad1db728fa804e62ded9a87d6.tar.xz kernel-qcow2-linux-17162a117cd0733ad1db728fa804e62ded9a87d6.zip | |
Merge back earlier cpufreq material for v5.1.
Diffstat (limited to 'drivers/cpufreq/qoriq-cpufreq.c')
| -rw-r--r-- | drivers/cpufreq/qoriq-cpufreq.c | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/drivers/cpufreq/qoriq-cpufreq.c b/drivers/cpufreq/qoriq-cpufreq.c index 3d773f64b4df..4295e5476264 100644 --- a/drivers/cpufreq/qoriq-cpufreq.c +++ b/drivers/cpufreq/qoriq-cpufreq.c @@ -13,7 +13,6 @@ #include <linux/clk.h> #include <linux/clk-provider.h> #include <linux/cpufreq.h> -#include <linux/cpu_cooling.h> #include <linux/errno.h> #include <linux/init.h> #include <linux/kernel.h> @@ -31,7 +30,6 @@ struct cpu_data { struct clk **pclk; struct cpufreq_frequency_table *table; - struct thermal_cooling_device *cdev; }; /* @@ -239,7 +237,6 @@ static int qoriq_cpufreq_cpu_exit(struct cpufreq_policy *policy) { struct cpu_data *data = policy->driver_data; - cpufreq_cooling_unregister(data->cdev); kfree(data->pclk); kfree(data->table); kfree(data); @@ -258,23 +255,15 @@ static int qoriq_cpufreq_target(struct cpufreq_policy *policy, return clk_set_parent(policy->clk, parent); } - -static void qoriq_cpufreq_ready(struct cpufreq_policy *policy) -{ - struct cpu_data *cpud = policy->driver_data; - - cpud->cdev = of_cpufreq_cooling_register(policy); -} - static struct cpufreq_driver qoriq_cpufreq_driver = { .name = "qoriq_cpufreq", - .flags = CPUFREQ_CONST_LOOPS, + .flags = CPUFREQ_CONST_LOOPS | + CPUFREQ_IS_COOLING_DEV, .init = qoriq_cpufreq_cpu_init, .exit = qoriq_cpufreq_cpu_exit, .verify = cpufreq_generic_frequency_table_verify, .target_index = qoriq_cpufreq_target, .get = cpufreq_generic_get, - .ready = qoriq_cpufreq_ready, .attr = cpufreq_generic_attr, }; |