media: staging: media: meson: vdec: use min() for comparison and assignment

Use of standard min() helper macro is preferred over using ternary
operator for logical evaluation and value assignment. This issue is
identified by coccicheck using the minmax.cocci file.

Signed-off-by: Deepak R Varma <drv@mailo.com>
Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>

diff --git a/drivers/staging/media/meson/vdec/codec_vp9.c b/drivers/staging/media/meson/vdec/codec_vp9.c
index cf0f58d982c8d2a23c2fcb6ec666250eab01c135..394df5761556ae107799f15bc5e4b087366a19c3 100644 (file)
--- a/drivers/staging/media/meson/vdec/codec_vp9.c
+++ b/drivers/staging/media/meson/vdec/codec_vp9.c
@@ -1459,7 +1459,7 @@ static void vp9_tree_merge_probs(unsigned int *prev_prob,
        if (den == 0) {
                new_prob = pre_prob;
        } else {
-               m_count = den < MODE_MV_COUNT_SAT ? den : MODE_MV_COUNT_SAT;
+               m_count = min(den, MODE_MV_COUNT_SAT);
                get_prob =
                        clip_prob(div_r32(((int64_t)tree_left * 256 +
                                           (den >> 1)),
@@ -1513,7 +1513,7 @@ static void adapt_coef_probs_cxt(unsigned int *prev_prob,
                        /* get binary prob */
                        num = branch_ct[node][0];
                        den = branch_ct[node][0] + branch_ct[node][1];
-                       m_count = den < count_sat ? den : count_sat;
+                       m_count = min(den, count_sat);
 
                        get_prob = (den == 0) ?
                                        128u :
@@ -1663,8 +1663,7 @@ static void adapt_coef_probs(int prev_kf, int cur_kf, int pre_fc,
                        if (den == 0) {
                                new_prob = pre_prob;
                        } else {
-                               m_count = den < MODE_MV_COUNT_SAT ?
-                                               den : MODE_MV_COUNT_SAT;
+                               m_count = min(den, MODE_MV_COUNT_SAT);
                                get_prob =
                                clip_prob(div_r32(((int64_t)
                                        count[coef_count_node_start] * 256 +