Staging: media: davinci_vpfe: Drop macro and use an in-kernel function

Drop macro CEIL and use an in-kernel function DIV_ROUND_UP.

Signed-off-by: Madhumitha Prabakaran <madhumithabiw@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/media/davinci_vpfe/dm365_ipipe.h b/drivers/staging/media/davinci_vpfe/dm365_ipipe.h
index 174334b53f96cea4787b96d601f082fb8084c1a0..866ae12aeb0781cf0384ddc3be5aec6cca614114 100644 (file)
--- a/drivers/staging/media/davinci_vpfe/dm365_ipipe.h
+++ b/drivers/staging/media/davinci_vpfe/dm365_ipipe.h
@@ -27,8 +27,6 @@
 #include "davinci_vpfe_user.h"
 #include "vpfe_video.h"
 
-#define CEIL(a, b)     (((a) + (b-1)) / (b))
-
 enum ipipe_noise_filter {
        IPIPE_D2F_1ST = 0,
        IPIPE_D2F_2ND = 1,

diff --git a/drivers/staging/media/davinci_vpfe/dm365_resizer.c b/drivers/staging/media/davinci_vpfe/dm365_resizer.c
index 9d726298b406a3c4c047befd1ee512d60823c953..d460963106fa0acc33324b1ebf625ea20179b711 100644 (file)
--- a/drivers/staging/media/davinci_vpfe/dm365_resizer.c
+++ b/drivers/staging/media/davinci_vpfe/dm365_resizer.c
@@ -386,7 +386,7 @@ resizer_calculate_down_scale_f_div_param(struct device *dev,
        }
        o = 10 + (two_power << 2);
        if (((input_width << 7) / rsz) % 2)
-               o += (((CEIL(rsz, 1024)) << 1) << n);
+               o += ((DIV_ROUND_UP(rsz, 1024) << 1) << n);
        h2 = output_width - h1;
        /* phi */
        val = (h1 * rsz) - (((upper_h1 - (o - 10)) / two_power) << 8);
@@ -630,7 +630,7 @@ resizer_calculate_normal_f_div_param(struct device *dev, int input_width,
                val /= rsz << 1;
                val <<= 1;
                val += 2;
-               o += ((CEIL(rsz, 1024)) << 1);
+               o += (DIV_ROUND_UP(rsz, 1024) << 1);
                h1 = val;
        }
        h2 = output_width - h1;