media: common: saa7146: Use min macro

Simplifies the code. Found by cocci:

drivers/media/common/saa7146/saa7146_hlp.c:125:36-37: WARNING opportunity for min()
drivers/media/common/saa7146/saa7146_hlp.c:154:41-42: WARNING opportunity for min()
drivers/media/common/saa7146/saa7146_hlp.c:286:35-36: WARNING opportunity for min()
drivers/media/common/saa7146/saa7146_hlp.c:289:35-36: WARNING opportunity for min()

Link: https://lore.kernel.org/linux-media/20240429-fix-cocci-v3-13-3c4865f5a4b0@chromium.org
Reviewed-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
Signed-off-by: Ricardo Ribalda <ribalda@chromium.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>

diff --git a/drivers/media/common/saa7146/saa7146_hlp.c b/drivers/media/common/saa7146/saa7146_hlp.c
index 7569d8cdd4d8d75e0cdf59fd00e09fa8d6355160..fe3348af543ef3d467d44598c2847913c540c612 100644 (file)
--- a/drivers/media/common/saa7146/saa7146_hlp.c
+++ b/drivers/media/common/saa7146/saa7146_hlp.c
@@ -122,7 +122,7 @@ static int calculate_h_scale_registers(struct saa7146_dev *dev,
        xacm = 0;
 
        /* set horizontal filter parameters (CXY = CXUV) */
-       cxy = hps_h_coeff_tab[( (xpsc - 1) < 63 ? (xpsc - 1) : 63 )].hps_coeff;
+       cxy = hps_h_coeff_tab[min(xpsc - 1, 63)].hps_coeff;
        cxuv = cxy;
 
        /* calculate and set horizontal fine scale (xsci) */
@@ -151,7 +151,7 @@ static int calculate_h_scale_registers(struct saa7146_dev *dev,
                xacm = 0;
                /* get best match in the table of attenuations
                   for horizontal scaling */
-               h_atten = hps_h_coeff_tab[( (xpsc - 1) < 63 ? (xpsc - 1) : 63 )].weight_sum;
+               h_atten = hps_h_coeff_tab[min(xpsc - 1, 63)].weight_sum;
 
                for (i = 0; h_attenuation[i] != 0; i++) {
                        if (h_attenuation[i] >= h_atten)
@@ -283,10 +283,10 @@ static int calculate_v_scale_registers(struct saa7146_dev *dev, enum v4l2_field
                }
 
                /* get filter coefficients for cya, cyb from table hps_v_coeff_tab */
-               cya_cyb = hps_v_coeff_tab[ (yacl < 63 ? yacl : 63 ) ].hps_coeff;
+               cya_cyb = hps_v_coeff_tab[min(yacl, 63)].hps_coeff;
 
                /* get best match in the table of attenuations for vertical scaling */
-               v_atten = hps_v_coeff_tab[ (yacl < 63 ? yacl : 63 ) ].weight_sum;
+               v_atten = hps_v_coeff_tab[min(yacl, 63)].weight_sum;
 
                for (i = 0; v_attenuation[i] != 0; i++) {
                        if (v_attenuation[i] >= v_atten)