[PATCH 1/4] drm/amd/display: Use min()/max() macros in dcn_calc_math

From: Deepak R Varma
Date: Sat Jan 14 2023 - 16:20:27 EST


Use the standard min() / max() helper macros instead of direct variable
comparison using if/else blocks or ternary operator. Change identified
using minmax.cocci Coccinelle semantic patch.

Signed-off-by: Deepak R Varma <drv@xxxxxxxxx>
---
.../gpu/drm/amd/display/dc/dml/calcs/dcn_calc_math.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/amd/display/dc/dml/calcs/dcn_calc_math.c b/drivers/gpu/drm/amd/display/dc/dml/calcs/dcn_calc_math.c
index cac72413a097..81629f3715d3 100644
--- a/drivers/gpu/drm/amd/display/dc/dml/calcs/dcn_calc_math.c
+++ b/drivers/gpu/drm/amd/display/dc/dml/calcs/dcn_calc_math.c
@@ -52,12 +52,12 @@ float dcn_bw_min2(const float arg1, const float arg2)
return arg2;
if (isNaN(arg2))
return arg1;
- return arg1 < arg2 ? arg1 : arg2;
+ return min(arg1, arg2);
}

unsigned int dcn_bw_max(const unsigned int arg1, const unsigned int arg2)
{
- return arg1 > arg2 ? arg1 : arg2;
+ return max(arg1, arg2);
}
float dcn_bw_max2(const float arg1, const float arg2)
{
@@ -65,7 +65,7 @@ float dcn_bw_max2(const float arg1, const float arg2)
return arg2;
if (isNaN(arg2))
return arg1;
- return arg1 > arg2 ? arg1 : arg2;
+ return max(arg1, arg2);
}

float dcn_bw_floor2(const float arg, const float significance)
@@ -93,12 +93,12 @@ float dcn_bw_ceil2(const float arg, const float significance)

float dcn_bw_max3(float v1, float v2, float v3)
{
- return v3 > dcn_bw_max2(v1, v2) ? v3 : dcn_bw_max2(v1, v2);
+ return max(v3, dcn_bw_max2(v1, v2));
}

float dcn_bw_max5(float v1, float v2, float v3, float v4, float v5)
{
- return dcn_bw_max3(v1, v2, v3) > dcn_bw_max2(v4, v5) ? dcn_bw_max3(v1, v2, v3) : dcn_bw_max2(v4, v5);
+ return max(dcn_bw_max3(v1, v2, v3), dcn_bw_max2(v4, v5));
}

float dcn_bw_pow(float a, float exp)
--
2.34.1