diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2024-07-10 13:03:11 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2024-07-10 13:03:11 +0200 |
| commit | 9dabb5b48fe5e7bf74ee4d1912c0403cf12885d4 (patch) | |
| tree | 720fd0d03e0ab2d757ac9ad7f4d87c13f47acb7d /drivers/cpufreq/cppc_cpufreq.c | |
| parent | d92467ad9d9ee63a700934b9228a989ef671d511 (diff) | |
| parent | 7ad9eab9d4b299c837aadb0789102d27c3f1c1e1 (diff) | |
| download | linux-9dabb5b48fe5e7bf74ee4d1912c0403cf12885d4.tar.gz linux-9dabb5b48fe5e7bf74ee4d1912c0403cf12885d4.tar.bz2 linux-9dabb5b48fe5e7bf74ee4d1912c0403cf12885d4.zip | |
Merge back cpufreq material for 6.11.
Diffstat (limited to 'drivers/cpufreq/cppc_cpufreq.c')
| -rw-r--r-- | drivers/cpufreq/cppc_cpufreq.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/drivers/cpufreq/cppc_cpufreq.c b/drivers/cpufreq/cppc_cpufreq.c index 15f1d41920a3..bafa32dd375d 100644 --- a/drivers/cpufreq/cppc_cpufreq.c +++ b/drivers/cpufreq/cppc_cpufreq.c @@ -291,15 +291,10 @@ static int cppc_cpufreq_set_target(struct cpufreq_policy *policy, struct cppc_cpudata *cpu_data = policy->driver_data; unsigned int cpu = policy->cpu; struct cpufreq_freqs freqs; - u32 desired_perf; int ret = 0; - desired_perf = cppc_khz_to_perf(&cpu_data->perf_caps, target_freq); - /* Return if it is exactly the same perf */ - if (desired_perf == cpu_data->perf_ctrls.desired_perf) - return ret; - - cpu_data->perf_ctrls.desired_perf = desired_perf; + cpu_data->perf_ctrls.desired_perf = + cppc_khz_to_perf(&cpu_data->perf_caps, target_freq); freqs.old = policy->cur; freqs.new = target_freq; @@ -688,7 +683,7 @@ out: return ret; } -static int cppc_cpufreq_cpu_exit(struct cpufreq_policy *policy) +static void cppc_cpufreq_cpu_exit(struct cpufreq_policy *policy) { struct cppc_cpudata *cpu_data = policy->driver_data; struct cppc_perf_caps *caps = &cpu_data->perf_caps; @@ -705,7 +700,6 @@ static int cppc_cpufreq_cpu_exit(struct cpufreq_policy *policy) caps->lowest_perf, cpu, ret); cppc_cpufreq_put_cpu_data(policy); - return 0; } static inline u64 get_delta(u64 t1, u64 t0) |