cpufreq: armada-37xx: use max() to calculate target_vm

Use max() macro while calculating target_vm to simplify and improve the
armada-37xx-cpufreq driver code.

Reported-by: kernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/r/202503251256.rrl65HgY-lkp@intel.com/
Reported-by: Yang Ruibin <11162571@vivo.com>
Closes: https://lore.kernel.org/lkml/2c55fb07-b29e-43e0-8697-f75d1f0df89a@vivo.com/
Signed-off-by: Akhilesh Patil <akhilesh@ee.iitb.ac.in>
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>

diff --git a/drivers/cpufreq/armada-37xx-cpufreq.c b/drivers/cpufreq/armada-37xx-cpufreq.c
index f28a4435fba71b06eeabbb76fac791597d6a2fc6..0efe403a59809cceb1e51fbf7db9a6fdbb1c7a2b 100644 (file)
--- a/drivers/cpufreq/armada-37xx-cpufreq.c
+++ b/drivers/cpufreq/armada-37xx-cpufreq.c
@@ -265,7 +265,7 @@ static void __init armada37xx_cpufreq_avs_configure(struct regmap *base,
         */
 
        target_vm = avs_map[l0_vdd_min] - 100;
-       target_vm = target_vm > MIN_VOLT_MV ? target_vm : MIN_VOLT_MV;
+       target_vm = max(target_vm, MIN_VOLT_MV);
        dvfs->avs[1] = armada_37xx_avs_val_match(target_vm);
 
        /*
@@ -273,7 +273,7 @@ static void __init armada37xx_cpufreq_avs_configure(struct regmap *base,
         * be larger than 1000mv
         */
        target_vm = avs_map[l0_vdd_min] - 150;
-       target_vm = target_vm > MIN_VOLT_MV ? target_vm : MIN_VOLT_MV;
+       target_vm = max(target_vm, MIN_VOLT_MV);
        dvfs->avs[2] = dvfs->avs[3] = armada_37xx_avs_val_match(target_vm);
 
        /*