Commit 2e975027 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

vermilion.c: use ALIGN(), not __ALIGN_MASK()

__ALIGN_MASK() is an internal implementation detail of ALIGN().  Let's not
needlessly fatten the interface in this driver.

[fujita.tomonori@lab.ntt.co.jp: fix it]
Cc: Alan Hourihane <alanh@fairlite.demon.co.uk>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Cc: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 0e904549
...@@ -651,7 +651,7 @@ static int vmlfb_check_var_locked(struct fb_var_screeninfo *var, ...@@ -651,7 +651,7 @@ static int vmlfb_check_var_locked(struct fb_var_screeninfo *var,
return -EINVAL; return -EINVAL;
} }
pitch = __ALIGN_MASK((var->xres * var->bits_per_pixel) >> 3, 0x3F); pitch = ALIGN((var->xres * var->bits_per_pixel) >> 3, 0x40);
mem = pitch * var->yres_virtual; mem = pitch * var->yres_virtual;
if (mem > vinfo->vram_contig_size) { if (mem > vinfo->vram_contig_size) {
return -ENOMEM; return -ENOMEM;
...@@ -785,8 +785,7 @@ static int vmlfb_set_par_locked(struct vml_info *vinfo) ...@@ -785,8 +785,7 @@ static int vmlfb_set_par_locked(struct vml_info *vinfo)
int clock; int clock;
vinfo->bytes_per_pixel = var->bits_per_pixel >> 3; vinfo->bytes_per_pixel = var->bits_per_pixel >> 3;
vinfo->stride = vinfo->stride = ALIGN(var->xres_virtual * vinfo->bytes_per_pixel, 0x40);
__ALIGN_MASK(var->xres_virtual * vinfo->bytes_per_pixel, 0x3F);
info->fix.line_length = vinfo->stride; info->fix.line_length = vinfo->stride;
if (!subsys) if (!subsys)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment