@@ -122,7 +122,7 @@ static int calculate_h_scale_registers(struct saa7146_dev *dev,
122
122
xacm = 0 ;
123
123
124
124
/* set horizontal filter parameters (CXY = CXUV) */
125
- cxy = hps_h_coeff_tab [( ( xpsc - 1 ) < 63 ? ( xpsc - 1 ) : 63 )].hps_coeff ;
125
+ cxy = hps_h_coeff_tab [min ( xpsc - 1 , 63 )].hps_coeff ;
126
126
cxuv = cxy ;
127
127
128
128
/* calculate and set horizontal fine scale (xsci) */
@@ -151,7 +151,7 @@ static int calculate_h_scale_registers(struct saa7146_dev *dev,
151
151
xacm = 0 ;
152
152
/* get best match in the table of attenuations
153
153
for horizontal scaling */
154
- h_atten = hps_h_coeff_tab [( ( xpsc - 1 ) < 63 ? ( xpsc - 1 ) : 63 )].weight_sum ;
154
+ h_atten = hps_h_coeff_tab [min ( xpsc - 1 , 63 )].weight_sum ;
155
155
156
156
for (i = 0 ; h_attenuation [i ] != 0 ; i ++ ) {
157
157
if (h_attenuation [i ] >= h_atten )
@@ -283,10 +283,10 @@ static int calculate_v_scale_registers(struct saa7146_dev *dev, enum v4l2_field
283
283
}
284
284
285
285
/* get filter coefficients for cya, cyb from table hps_v_coeff_tab */
286
- cya_cyb = hps_v_coeff_tab [ (yacl < 63 ? yacl : 63 ) ].hps_coeff ;
286
+ cya_cyb = hps_v_coeff_tab [min (yacl , 63 ) ].hps_coeff ;
287
287
288
288
/* get best match in the table of attenuations for vertical scaling */
289
- v_atten = hps_v_coeff_tab [ (yacl < 63 ? yacl : 63 ) ].weight_sum ;
289
+ v_atten = hps_v_coeff_tab [min (yacl , 63 ) ].weight_sum ;
290
290
291
291
for (i = 0 ; v_attenuation [i ] != 0 ; i ++ ) {
292
292
if (v_attenuation [i ] >= v_atten )
0 commit comments