]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
media: atomisp: use clamp() in compute_coring()
authorLi Zetao <lizetao1@huawei.com>
Fri, 30 Aug 2024 01:17:52 +0000 (03:17 +0200)
committerMauro Carvalho Chehab <mchehab+huawei@kernel.org>
Fri, 6 Sep 2024 09:56:54 +0000 (11:56 +0200)
When it needs to get a value within a certain interval, using clamp()
makes the code easier to understand than min(max()).

Signed-off-by: Li Zetao <lizetao1@huawei.com>
Link: https://lore.kernel.org/r/20240830011752.603433-3-lizetao1@huawei.com
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
drivers/staging/media/atomisp/pci/isp/kernels/xnr/xnr_3.0/ia_css_xnr3.host.c

index 70132d955e9bce5c7fbbaff2b9542185d27e9267..def2c8fb4b389d7aa8d5131d52e2d65c11fd8a55 100644 (file)
@@ -108,7 +108,7 @@ compute_coring(int coring)
         * factor. Clip to [0, isp_scale-1).
         */
        isp_coring = ((coring * isp_scale) + offset) / host_scale;
-       return min(max(isp_coring, 0), isp_scale - 1);
+       return clamp(isp_coring, 0, isp_scale - 1);
 }
 
 /*
@@ -168,15 +168,15 @@ ia_css_xnr3_encode(
        to->alpha.y0 = alpha_y0;
        to->alpha.u0 = alpha_u0;
        to->alpha.v0 = alpha_v0;
-       to->alpha.ydiff = min(max(alpha_ydiff, min_diff), max_diff);
-       to->alpha.udiff = min(max(alpha_udiff, min_diff), max_diff);
-       to->alpha.vdiff = min(max(alpha_vdiff, min_diff), max_diff);
+       to->alpha.ydiff = clamp(alpha_ydiff, min_diff, max_diff);
+       to->alpha.udiff = clamp(alpha_udiff, min_diff, max_diff);
+       to->alpha.vdiff = clamp(alpha_vdiff, min_diff, max_diff);
 
        /* coring parameters are expressed in q1.NN format */
        to->coring.u0 = coring_u0;
        to->coring.v0 = coring_v0;
-       to->coring.udiff = min(max(coring_udiff, min_diff), max_diff);
-       to->coring.vdiff = min(max(coring_vdiff, min_diff), max_diff);
+       to->coring.udiff = clamp(coring_udiff, min_diff, max_diff);
+       to->coring.vdiff = clamp(coring_vdiff, min_diff, max_diff);
 
        /* blending strength is expressed in q1.NN format */
        to->blending.strength = blending;