From: Andrew Morton __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 Cc: "Antonino A. Daplas" Cc: FUJITA Tomonori Signed-off-by: Andrew Morton --- drivers/video/vermilion/vermilion.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff -puN drivers/video/vermilion/vermilion.c~vermilionc-use-align-not-__align_mask drivers/video/vermilion/vermilion.c --- a/drivers/video/vermilion/vermilion.c~vermilionc-use-align-not-__align_mask +++ a/drivers/video/vermilion/vermilion.c @@ -660,7 +660,7 @@ static int vmlfb_check_var_locked(struct 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; if (mem > vinfo->vram_contig_size) { return -ENOMEM; @@ -794,8 +794,7 @@ static int vmlfb_set_par_locked(struct v int clock; vinfo->bytes_per_pixel = var->bits_per_pixel >> 3; - vinfo->stride = - __ALIGN_MASK(var->xres_virtual * vinfo->bytes_per_pixel, 0x3F); + vinfo->stride = ALIGN(var->xres_virtual * vinfo->bytes_per_pixel, 0x40); info->fix.line_length = vinfo->stride; if (!subsys) _