aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorAndrew Morton <akpm@linux-foundation.org>2008-02-06 04:39:16 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-06 13:41:16 -0500
commit2e9750272cd49732293b6fe771ae110be8d87273 (patch)
tree25ef9c021c4376c1f79a0a587f37666e1554a0e2 /drivers
parent0e9045494aa50f34b774a7449dde4128240a7b00 (diff)
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: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/video/vermilion/vermilion.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/video/vermilion/vermilion.c b/drivers/video/vermilion/vermilion.c
index 1c656667b937..2aa71eb67c2b 100644
--- a/drivers/video/vermilion/vermilion.c
+++ b/drivers/video/vermilion/vermilion.c
@@ -651,7 +651,7 @@ static int vmlfb_check_var_locked(struct fb_var_screeninfo *var,
651 return -EINVAL; 651 return -EINVAL;
652 } 652 }
653 653
654 pitch = __ALIGN_MASK((var->xres * var->bits_per_pixel) >> 3, 0x3F); 654 pitch = ALIGN((var->xres * var->bits_per_pixel) >> 3, 0x40);
655 mem = pitch * var->yres_virtual; 655 mem = pitch * var->yres_virtual;
656 if (mem > vinfo->vram_contig_size) { 656 if (mem > vinfo->vram_contig_size) {
657 return -ENOMEM; 657 return -ENOMEM;
@@ -785,8 +785,7 @@ static int vmlfb_set_par_locked(struct vml_info *vinfo)
785 int clock; 785 int clock;
786 786
787 vinfo->bytes_per_pixel = var->bits_per_pixel >> 3; 787 vinfo->bytes_per_pixel = var->bits_per_pixel >> 3;
788 vinfo->stride = 788 vinfo->stride = ALIGN(var->xres_virtual * vinfo->bytes_per_pixel, 0x40);
789 __ALIGN_MASK(var->xres_virtual * vinfo->bytes_per_pixel, 0x3F);
790 info->fix.line_length = vinfo->stride; 789 info->fix.line_length = vinfo->stride;
791 790
792 if (!subsys) 791 if (!subsys)