diff options
| author |   Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2022-05-06 21:00:44 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2022-05-06 21:00:44 +0200 |
| commit | 46acb9d9b6bb24448936365ec4e49198aa712090 (patch) | |
| tree | 39ef5f9c16564721025ee376ecc1dba3e0907c74 /drivers/cpufreq | |
| parent | cpufreq: Avoid unnecessary frequency updates due to mismatch (diff) | |
| parent | powercap: DTPM: Check for Energy Model type (diff) | |
| download | linux-dev-46acb9d9b6bb24448936365ec4e49198aa712090.tar.xz linux-dev-46acb9d9b6bb24448936365ec4e49198aa712090.zip | |
Merge Energy Model material for 5.19 to satisfy dependencies.
Diffstat (limited to 'drivers/cpufreq')
| -rw-r--r-- | drivers/cpufreq/mediatek-cpufreq-hw.c | 4 | ||||
| -rw-r--r-- | drivers/cpufreq/scmi-cpufreq.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/cpufreq/mediatek-cpufreq-hw.c b/drivers/cpufreq/mediatek-cpufreq-hw.c index 0a94c56ddad2..813cccbfe934 100644 --- a/drivers/cpufreq/mediatek-cpufreq-hw.c +++ b/drivers/cpufreq/mediatek-cpufreq-hw.c @@ -51,8 +51,8 @@ static const u16 cpufreq_mtk_offsets[REG_ARRAY_SIZE] = { }; static int __maybe_unused -mtk_cpufreq_get_cpu_power(unsigned long *mW, - unsigned long *KHz, struct device *cpu_dev) +mtk_cpufreq_get_cpu_power(struct device *cpu_dev, unsigned long *mW, + unsigned long *KHz) { struct mtk_cpufreq_data *data; struct cpufreq_policy *policy; diff --git a/drivers/cpufreq/scmi-cpufreq.c b/drivers/cpufreq/scmi-cpufreq.c index 919fa6e3f462..6d2a4cf46db7 100644 --- a/drivers/cpufreq/scmi-cpufreq.c +++ b/drivers/cpufreq/scmi-cpufreq.c @@ -96,8 +96,8 @@ scmi_get_sharing_cpus(struct device *cpu_dev, struct cpumask *cpumask) } static int __maybe_unused -scmi_get_cpu_power(unsigned long *power, unsigned long *KHz, - struct device *cpu_dev) +scmi_get_cpu_power(struct device *cpu_dev, unsigned long *power, + unsigned long *KHz) { unsigned long Hz; int ret, domain; |