drm/vmwgfx: use ALIGN instead of open coding it

Commit Message

Matt Turner Feb. 25, 2010, 4:28 a.m. UTC

None

Patch

diff --git a/drivers/gpu/drm/vmwgfx/svga_overlay.h b/drivers/gpu/drm/vmwgfx/svga_overlay.h
index f753d73..55b7627 100644
--- a/drivers/gpu/drm/vmwgfx/svga_overlay.h
+++ b/drivers/gpu/drm/vmwgfx/svga_overlay.h
@@ -143,7 +143,7 @@  VMwareVideoGetAttributes(const SVGAOverlayFormat format,    // IN
 {
     int tmp;
 
-    *width = (*width + 1) & ~1;
+    *width = ALIGN(*width, 2)
 
     if (offsets) {
         offsets[0] = 0;
@@ -151,8 +151,8 @@  VMwareVideoGetAttributes(const SVGAOverlayFormat format,    // IN
 
     switch (format) {
     case VMWARE_FOURCC_YV12:
-       *height = (*height + 1) & ~1;
-       *size = (*width + 3) & ~3;
+       *height = ALIGN(*height, 2);
+       *size = ALIGN(*width, 4);
 
        if (pitches) {
           pitches[0] = *size;
@@ -164,7 +164,7 @@  VMwareVideoGetAttributes(const SVGAOverlayFormat format,    // IN
           offsets[1] = *size;
        }
 
-       tmp = ((*width >> 1) + 3) & ~3;
+       tmp = ALIGN(*width >> 1, 4);
 
        if (pitches) {
           pitches[1] = pitches[2] = tmp;