OMAPDSS: DISPC: fix DS variable name

check_horiz_timing_omap3() has a variable named 'DS'. i386 uses DS name
for something else, causing a compilation error. As 'DS' is not a very
good local variable name in the first place, let's change it to 'ds',
fixing the issue.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>

diff --git a/drivers/video/omap2/dss/dispc.c b/drivers/video/omap2/dss/dispc.c
index 05def42e528b4790d9cb3a4a4f06487ff8ffbec6..33c4403642dc2fae2a841b0e6e7565f3d5cb4458 100644 (file)
--- a/drivers/video/omap2/dss/dispc.c
+++ b/drivers/video/omap2/dss/dispc.c
@@ -1999,7 +1999,7 @@ static int check_horiz_timing_omap3(enum omap_plane plane,
                const struct omap_video_timings *t, u16 pos_x,
                u16 width, u16 height, u16 out_width, u16 out_height)
 {
-       int DS = DIV_ROUND_UP(height, out_height);
+       const int ds = DIV_ROUND_UP(height, out_height);
        unsigned long nonactive;
        static const u8 limits[3] = { 8, 10, 20 };
        u64 val, blank;
@@ -2026,8 +2026,8 @@ static int check_horiz_timing_omap3(enum omap_plane plane,
         */
        val = div_u64((u64)(nonactive - pos_x) * lclk, pclk);
        DSSDBG("(nonactive - pos_x) * pcd = %llu max(0, DS - 2) * width = %d\n",
-               val, max(0, DS - 2) * width);
-       if (val < max(0, DS - 2) * width)
+               val, max(0, ds - 2) * width);
+       if (val < max(0, ds - 2) * width)
                return -EINVAL;
 
        /*
@@ -2037,8 +2037,8 @@ static int check_horiz_timing_omap3(enum omap_plane plane,
         */
        val =  div_u64((u64)nonactive * lclk, pclk);
        DSSDBG("nonactive * pcd  = %llu, max(0, DS - 1) * width = %d\n",
-               val, max(0, DS - 1) * width);
-       if (val < max(0, DS - 1) * width)
+               val, max(0, ds - 1) * width);
+       if (val < max(0, ds - 1) * width)
                return -EINVAL;
 
        return 0;