fbdev: use DIV_ROUND_UP or roundup

The kernel.h macro DIV_ROUND_UP performs the computation (((n) + (d) - 1) /
(d)) but is perhaps more readable.

An extract of the semantic patch that makes this change is as follows:
(http://www.emn.fr/x-info/coccinelle/)

// <smpl>
@haskernel@
@@

#include <linux/kernel.h>

@depends on haskernel@
expression n,d;
@@

(
- (n + d - 1) / d
+ DIV_ROUND_UP(n,d)
|
- (n + (d - 1)) / d
+ DIV_ROUND_UP(n,d)
)

@depends on haskernel@
expression n,d;
@@

- DIV_ROUND_UP((n),d)
+ DIV_ROUND_UP(n,d)

@depends on haskernel@
expression n,d;
@@

- DIV_ROUND_UP(n,(d))
+ DIV_ROUND_UP(n,d)
// </smpl>

Signed-off-by: Julia Lawall <julia@diku.dk>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/drivers/video/atafb.c b/drivers/video/atafb.c
index 5d4fbaa53a6cefd6fc69a9676987c77de7f5b732..dff35474b854f5b3949d730e8cafc7241792a01f 100644 (file)
--- a/drivers/video/atafb.c
+++ b/drivers/video/atafb.c
@@ -1270,7 +1270,7 @@ again:
 
        gstart = (prescale / 2 + plen * left_margin) / prescale;
        /* gend1 is for hde (gend-gstart multiple of align), shifter's xres */
-       gend1 = gstart + ((xres + align - 1) / align) * align * plen / prescale;
+       gend1 = gstart + roundup(xres, align) * plen / prescale;
        /* gend2 is for hbb, visible xres (rest to gend1 is cut off by hblank) */
        gend2 = gstart + xres * plen / prescale;
        par->HHT = plen * (left_margin + xres + right_margin) /

diff --git a/drivers/video/cirrusfb.c b/drivers/video/cirrusfb.c
index f7e2d5add83172239d2a805c500d2e6fcb353ec0..ccfbdc5a40dbdb7aac4da0bd4e3641a41616992c 100644 (file)
--- a/drivers/video/cirrusfb.c
+++ b/drivers/video/cirrusfb.c
@@ -3117,7 +3117,7 @@ static void bestclock(long freq, long *best, long *nom,
                                }
                        }
                }
-               d = ((143181 * n) + f - 1) / f;
+               d = DIV_ROUND_UP(143181 * n, f);
                if ((d >= 7) && (d <= 63)) {
                        if (d > 31)
                                d = (d / 2) * 2;

diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c
index 022282494d3fecee136f47d831e2dd4e534fe62d..025d4f5e1f6f9935ca000d79a4d39b579cb0f587 100644 (file)
--- a/drivers/video/console/fbcon.c
+++ b/drivers/video/console/fbcon.c
@@ -620,8 +620,7 @@ static void fbcon_prepare_logo(struct vc_data *vc, struct fb_info *info,
        if (fb_get_color_depth(&info->var, &info->fix) == 1)
                erase &= ~0x400;
        logo_height = fb_prepare_logo(info, ops->rotate);
-       logo_lines = (logo_height + vc->vc_font.height - 1) /
-               vc->vc_font.height;
+       logo_lines = DIV_ROUND_UP(logo_height, vc->vc_font.height);
        q = (unsigned short *) (vc->vc_origin +
                                vc->vc_size_row * rows);
        step = logo_lines * cols;

diff --git a/drivers/video/gxt4500.c b/drivers/video/gxt4500.c
index e92337bef50d00951bc4a7b9689f0d05b31a62ec..564557792bed6e616d590b8c49a1d28f3719f442 100644 (file)
--- a/drivers/video/gxt4500.c
+++ b/drivers/video/gxt4500.c
@@ -238,7 +238,7 @@ static int calc_pll(int period_ps, struct gxt4500_par *par)
        for (pdiv1 = 1; pdiv1 <= 8; ++pdiv1) {
                for (pdiv2 = 1; pdiv2 <= pdiv1; ++pdiv2) {
                        postdiv = pdiv1 * pdiv2;
-                       pll_period = (period_ps + postdiv - 1) / postdiv;
+                       pll_period = DIV_ROUND_UP(period_ps, postdiv);
                        /* keep pll in range 350..600 MHz */
                        if (pll_period < 1666 || pll_period > 2857)
                                continue;