]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
PM / devfreq: Limit max_freq with scaling_min_freq
authorLifeng Zheng <zhenglifeng1@huawei.com>
Mon, 21 Apr 2025 03:00:18 +0000 (11:00 +0800)
committerChanwoo Choi <cw00.choi@samsung.com>
Mon, 14 Jul 2025 11:04:16 +0000 (20:04 +0900)
Limit max_freq in devfreq_get_freq_range() with scaling_min_freq to avoid
showing an unreachable freq when reading it.

Use macro clamp to simplify code.

Signed-off-by: Lifeng Zheng <zhenglifeng1@huawei.com>
Link: https://lore.kernel.org/lkml/20250421030020.3108405-3-zhenglifeng1@huawei.com/
Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
drivers/devfreq/devfreq.c

index 98657d3b9435c7d4b30c0777d7d6d982a96f4107..2810c84b9f8a29c490b45971ca4fb0baab3d24f0 100644 (file)
@@ -152,11 +152,8 @@ void devfreq_get_freq_range(struct devfreq *devfreq,
                                (unsigned long)HZ_PER_KHZ * qos_max_freq);
 
        /* Apply constraints from OPP interface */
-       *min_freq = max(*min_freq, devfreq->scaling_min_freq);
-       *max_freq = min(*max_freq, devfreq->scaling_max_freq);
-
-       if (*min_freq > *max_freq)
-               *min_freq = *max_freq;
+       *max_freq = clamp(*max_freq, devfreq->scaling_min_freq, devfreq->scaling_max_freq);
+       *min_freq = clamp(*min_freq, devfreq->scaling_min_freq, *max_freq);
 }
 EXPORT_SYMBOL(devfreq_get_freq_range);