| Message ID | 20250421030020.3108405-3-zhenglifeng1@huawei.com |
|---|---|
| State | New |
| Headers | show |
| Series | [1/4] PM / devfreq: governor: Replace sscanf() with kstrtoul() in set_freq_store() | expand |
Hi, Applied it. Thanks. On Mon, Apr 21, 2025 at 12:00 PM Lifeng Zheng <zhenglifeng1@huawei.com> wrote: > > 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> > --- > drivers/devfreq/devfreq.c | 7 ++----- > 1 file changed, 2 insertions(+), 5 deletions(-) > > diff --git a/drivers/devfreq/devfreq.c b/drivers/devfreq/devfreq.c > index 98657d3b9435..2810c84b9f8a 100644 > --- a/drivers/devfreq/devfreq.c > +++ b/drivers/devfreq/devfreq.c > @@ -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); > > -- > 2.33.0 > >
diff --git a/drivers/devfreq/devfreq.c b/drivers/devfreq/devfreq.c index 98657d3b9435..2810c84b9f8a 100644 --- a/drivers/devfreq/devfreq.c +++ b/drivers/devfreq/devfreq.c @@ -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);
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> --- drivers/devfreq/devfreq.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)