| Message ID | 20250205112523.201101-2-dhananjay.ugwekar@amd.com (mailing list archive) |
|---|---|
| State | New |
| Delegated to: | Mario Limonciello |
| Headers | show |
| Series | cpufreq/amd-pstate: Fixes and optimizations | expand |
On 2/5/2025 05:25, Dhananjay Ugwekar wrote: > Scope based guard/cleanup macros should not be used together with goto > labels. Hence, remove the goto label. > > Fixes: 6c093d5a5b73 ("cpufreq/amd-pstate: convert mutex use to guard()") > Signed-off-by: Dhananjay Ugwekar <dhananjay.ugwekar@amd.com> Thanks. Reviewed-by: Mario Limonciello <mario.limonciello@amd.com> I'll queue this fix for 6.14-rc. > --- > drivers/cpufreq/amd-pstate.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/cpufreq/amd-pstate.c b/drivers/cpufreq/amd-pstate.c > index 7120f035c0be..b163c1699821 100644 > --- a/drivers/cpufreq/amd-pstate.c > +++ b/drivers/cpufreq/amd-pstate.c > @@ -838,8 +838,10 @@ static void amd_pstate_update_limits(unsigned int cpu) > guard(mutex)(&amd_pstate_driver_lock); > > ret = amd_get_highest_perf(cpu, &cur_high); > - if (ret) > - goto free_cpufreq_put; > + if (ret) { > + cpufreq_cpu_put(policy); > + return; > + } > > prev_high = READ_ONCE(cpudata->prefcore_ranking); > highest_perf_changed = (prev_high != cur_high); > @@ -849,8 +851,6 @@ static void amd_pstate_update_limits(unsigned int cpu) > if (cur_high < CPPC_MAX_PERF) > sched_set_itmt_core_prio((int)cur_high, cpu); > } > - > -free_cpufreq_put: > cpufreq_cpu_put(policy); > > if (!highest_perf_changed)
diff --git a/drivers/cpufreq/amd-pstate.c b/drivers/cpufreq/amd-pstate.c index 7120f035c0be..b163c1699821 100644 --- a/drivers/cpufreq/amd-pstate.c +++ b/drivers/cpufreq/amd-pstate.c @@ -838,8 +838,10 @@ static void amd_pstate_update_limits(unsigned int cpu) guard(mutex)(&amd_pstate_driver_lock); ret = amd_get_highest_perf(cpu, &cur_high); - if (ret) - goto free_cpufreq_put; + if (ret) { + cpufreq_cpu_put(policy); + return; + } prev_high = READ_ONCE(cpudata->prefcore_ranking); highest_perf_changed = (prev_high != cur_high); @@ -849,8 +851,6 @@ static void amd_pstate_update_limits(unsigned int cpu) if (cur_high < CPPC_MAX_PERF) sched_set_itmt_core_prio((int)cur_high, cpu); } - -free_cpufreq_put: cpufreq_cpu_put(policy); if (!highest_perf_changed)
Scope based guard/cleanup macros should not be used together with goto labels. Hence, remove the goto label. Fixes: 6c093d5a5b73 ("cpufreq/amd-pstate: convert mutex use to guard()") Signed-off-by: Dhananjay Ugwekar <dhananjay.ugwekar@amd.com> --- drivers/cpufreq/amd-pstate.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)