diff mbox series

cpufreq: Use clamp helper macro to improve the code readability

Message ID 20230816015853.849426-1-liaochang1@huawei.com
State New
Headers
Series cpufreq: Use clamp helper macro to improve the code readability |

Commit Message

Liao Chang Aug. 16, 2023, 1:58 a.m. UTC 
  The valid values of policy.{min, max} should be between 'min' and 'max',
so use clamp() helper macro to makes cpufreq_verify_within_limits() more
readable.

Signed-off-by: Liao Chang <liaochang1@huawei.com>
---
 include/linux/cpufreq.h | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

Comments

Rafael J. Wysocki Aug. 22, 2023, 8:12 p.m. UTC | #1 
On Wed, Aug 16, 2023 at 4:00 AM Liao Chang <liaochang1@huawei.com> wrote:
>
> The valid values of policy.{min, max} should be between 'min' and 'max',
> so use clamp() helper macro to makes cpufreq_verify_within_limits() more
> readable.
>
> Signed-off-by: Liao Chang <liaochang1@huawei.com>
> ---
>  include/linux/cpufreq.h | 14 +++-----------
>  1 file changed, 3 insertions(+), 11 deletions(-)
>
> diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h
> index 99da27466b8f..43b363a99215 100644
> --- a/include/linux/cpufreq.h
> +++ b/include/linux/cpufreq.h
> @@ -19,6 +19,7 @@
>  #include <linux/pm_qos.h>
>  #include <linux/spinlock.h>
>  #include <linux/sysfs.h>
> +#include <linux/minmax.h>
>
>  /*********************************************************************
>   *                        CPUFREQ INTERFACE                          *
> @@ -467,17 +468,8 @@ static inline void cpufreq_verify_within_limits(struct cpufreq_policy_data *poli
>                                                 unsigned int min,
>                                                 unsigned int max)
>  {
> -       if (policy->min < min)
> -               policy->min = min;
> -       if (policy->max < min)
> -               policy->max = min;
> -       if (policy->min > max)
> -               policy->min = max;
> -       if (policy->max > max)
> -               policy->max = max;
> -       if (policy->min > policy->max)
> -               policy->min = policy->max;
> -       return;
> +       policy->max = clamp(policy->max, min, max);
> +       policy->min = clamp(policy->min, min, policy->max);
>  }
>
>  static inline void
> --

Applied (with minor edits in the subject and changelog) as 6.6 material, thanks!
diff mbox series

Patch

diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h
index 99da27466b8f..43b363a99215 100644
--- a/include/linux/cpufreq.h
+++ b/include/linux/cpufreq.h
@@ -19,6 +19,7 @@ 
 #include <linux/pm_qos.h>
 #include <linux/spinlock.h>
 #include <linux/sysfs.h>
+#include <linux/minmax.h>
 
 /*********************************************************************
  *                        CPUFREQ INTERFACE                          *
@@ -467,17 +468,8 @@  static inline void cpufreq_verify_within_limits(struct cpufreq_policy_data *poli
 						unsigned int min,
 						unsigned int max)
 {
-	if (policy->min < min)
-		policy->min = min;
-	if (policy->max < min)
-		policy->max = min;
-	if (policy->min > max)
-		policy->min = max;
-	if (policy->max > max)
-		policy->max = max;
-	if (policy->min > policy->max)
-		policy->min = policy->max;
-	return;
+	policy->max = clamp(policy->max, min, max);
+	policy->min = clamp(policy->min, min, policy->max);
 }
 
 static inline void