4 files changed, 4 insertions, 5 deletions

diff --git a/drivers/video/atafb.c b/drivers/video/atafb.c
index 5d4fbaa53a6c..dff35474b854 100644
--- 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 f7e2d5add831..ccfbdc5a40db 100644
--- 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 022282494d3f..025d4f5e1f6f 100644
--- 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 e92337bef50d..564557792bed 100644
--- 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;