From 78d83b293891c597cef773eb17d9cc02b386f21a Mon Sep 17 00:00:00 2001 From: Lifeng Zheng Date: Tue, 2 Dec 2025 15:27:27 +0800 Subject: [PATCH] cpufreq: cpufreq_boost_trigger_state() optimization Optimize the error handling code in cpufreq_boost_trigger_state(). Signed-off-by: Lifeng Zheng Acked-by: Viresh Kumar Reviewed-by: Jie Zhan [ rjw: Changelog edit ] Link: https://patch.msgid.link/20251202072727.1368285-3-zhenglifeng1@huawei.com Signed-off-by: Rafael J. Wysocki --- drivers/cpufreq/cpufreq.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c index 8de9c94c097fe..50dde2980f1b6 100644 --- a/drivers/cpufreq/cpufreq.c +++ b/drivers/cpufreq/cpufreq.c @@ -2820,19 +2820,14 @@ static int cpufreq_boost_trigger_state(int state) continue; ret = policy_set_boost(policy, state); - if (ret) - goto err_reset_state; + if (unlikely(ret)) + break; } - if (ret) - goto err_reset_state; - cpus_read_unlock(); - return 0; - -err_reset_state: - cpus_read_unlock(); + if (likely(!ret)) + return 0; write_lock_irqsave(&cpufreq_driver_lock, flags); cpufreq_driver->boost_enabled = !state; -- 2.47.3