video: console, use DIV_ROUND_UP

Use DIV_ROUND_UP explicitly instead of manual shifts and adds.  It makes
the code more readable and consistent (sometimes there were shifts,
sometimes divs).

There is no change on the assembly level (compilers should do the right
job).

Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
Cc: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
Cc: Andi Kleen <andi@firstfloor.org>
Cc: Krzysztof Helt <krzysztof.h1@poczta.fm>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/drivers/video/console/bitblit.c b/drivers/video/console/bitblit.c
index 69864b1..6b7c8fb 100644 (file)
--- a/drivers/video/console/bitblit.c
+++ b/drivers/video/console/bitblit.c
@@ -25,7 +25,7 @@ static inline void update_attr(u8 *dst, u8 *src, int attribute,
                               struct vc_data *vc)
 {
        int i, offset = (vc->vc_font.height < 10) ? 1 : 2;
-       int width = (vc->vc_font.width + 7) >> 3;
+       int width = DIV_ROUND_UP(vc->vc_font.width, 8);
        unsigned int cellsize = vc->vc_font.height * width;
        u8 c;
 
@@ -144,7 +144,7 @@ static void bit_putcs(struct vc_data *vc, struct fb_info *info,
                      int fg, int bg)
 {
        struct fb_image image;
-       u32 width = (vc->vc_font.width + 7)/8;
+       u32 width = DIV_ROUND_UP(vc->vc_font.width, 8);
        u32 cellsize = width * vc->vc_font.height;
        u32 maxcnt = info->pixmap.size/cellsize;
        u32 scan_align = info->pixmap.scan_align - 1;
@@ -173,7 +173,7 @@ static void bit_putcs(struct vc_data *vc, struct fb_info *info,
                        cnt = count;
 
                image.width = vc->vc_font.width * cnt;
-               pitch = ((image.width + 7) >> 3) + scan_align;
+               pitch = DIV_ROUND_UP(image.width, 8) + scan_align;
                pitch &= ~scan_align;
                size = pitch * image.height + buf_align;
                size &= ~buf_align;
@@ -239,7 +239,7 @@ static void bit_cursor(struct vc_data *vc, struct fb_info *info, int mode,
        struct fb_cursor cursor;
        struct fbcon_ops *ops = info->fbcon_par;
        unsigned short charmask = vc->vc_hi_font_mask ? 0x1ff : 0xff;
-       int w = (vc->vc_font.width + 7) >> 3, c;
+       int w = DIV_ROUND_UP(vc->vc_font.width, 8), c;
        int y = real_y(ops->p, vc->vc_y);
        int attribute, use_sw = (vc->vc_cursor_type & 0x10);
        int err = 1;