media: atomisp: Use clamp() in ia_css_eed1_8_vmem_encode()

Using clamp() instead of min_t(max_t()) is easier to read.

It also reduces the size of the preprocessed files by ~ 193 ko.
(see [1] for a discussion about it)

$ ls -l ia_css_eed1_8.host*.i
 4829993 27 juil. 14:36 ia_css_eed1_8.host.old.i
 4636649 27 juil. 14:42 ia_css_eed1_8.host.new.i

[1]: https://lore.kernel.org/all/23bdb6fc8d884ceebeb6e8b8653b8cfe@AcuMS.aculab.com/

Signed-off-by: Christophe JAILLET <[email protected]>
Link: https://lore.kernel.org/r/155aba6ab759e98f66349e6bb4f69e2410486c09.1722084704.git.christophe.jaillet@wanadoo.fr
Signed-off-by: Hans de Goede <[email protected]>
Signed-off-by: Mauro Carvalho Chehab <[email protected]>

diff --git a/drivers/staging/media/atomisp/pci/isp/kernels/eed1_8/ia_css_eed1_8.host.c b/drivers/staging/media/atomisp/pci/isp/kernels/eed1_8/ia_css_eed1_8.host.c
index 55d102b479ac2f58daf8e0a4dd8f2867274ef3b0..b79d78e5b77f5bbcf87bd6bc1889fb723da2ab56 100644 (file)
--- a/drivers/staging/media/atomisp/pci/isp/kernels/eed1_8/ia_css_eed1_8.host.c
+++ b/drivers/staging/media/atomisp/pci/isp/kernels/eed1_8/ia_css_eed1_8.host.c
@@ -172,25 +172,21 @@ ia_css_eed1_8_vmem_encode(
                base = shuffle_block * i;
 
                for (j = 0; j < IA_CSS_NUMBER_OF_DEW_ENHANCE_SEGMENTS; j++) {
-                       to->e_dew_enh_x[0][base + j] = min_t(int, max_t(int,
-                                                            from->dew_enhance_seg_x[j], 0),
-                                                            8191);
-                       to->e_dew_enh_y[0][base + j] = min_t(int, max_t(int,
-                                                            from->dew_enhance_seg_y[j], -8192),
-                                                            8191);
+                       to->e_dew_enh_x[0][base + j] = clamp(from->dew_enhance_seg_x[j],
+                                                            0, 8191);
+                       to->e_dew_enh_y[0][base + j] = clamp(from->dew_enhance_seg_y[j],
+                                                            -8192, 8191);
                }
 
                for (j = 0; j < (IA_CSS_NUMBER_OF_DEW_ENHANCE_SEGMENTS - 1); j++) {
-                       to->e_dew_enh_a[0][base + j] = min_t(int, max_t(int,
-                                                            from->dew_enhance_seg_slope[j],
-                                                            -8192), 8191);
+                       to->e_dew_enh_a[0][base + j] = clamp(from->dew_enhance_seg_slope[j],
+                                                            -8192, 8191);
                        /* Convert dew_enhance_seg_exp to flag:
                         * 0 -> 0
                         * 1...13 -> 1
                         */
-                       to->e_dew_enh_f[0][base + j] = (min_t(int, max_t(int,
-                                                             from->dew_enhance_seg_exp[j],
-                                                             0), 13) > 0);
+                       to->e_dew_enh_f[0][base + j] = clamp(from->dew_enhance_seg_exp[j],
+                                                            0, 13) > 0;
                }
 
                /* Hard-coded to 0, in order to be able to handle out of