OMAPDSS: DSSCOMP: Fix sparse warnings in gralloc

Fix sparse warning:
drivers/video/omap2/dsscomp/gralloc.c:343:11: warning: symbol 'size' shadows an earlier one
drivers/video/omap2/dsscomp/gralloc.c:309:7: originally declared here
drivers/video/omap2/dsscomp/gralloc.c:563:10: warning: symbol 't' shadows an earlier one
drivers/video/omap2/dsscomp/gralloc.c:524:22: originally declared here

Change-Id: Iedd59c2ac59ae98d81d59a76f6f0b844aecba7fe
Signed-off-by: Arthur Philpott <arthur.philpott@ti.com>

diff --git a/drivers/video/omap2/dsscomp/gralloc.c b/drivers/video/omap2/dsscomp/gralloc.c
index 676346f9ba44c9f0b7cc813f0d88a1926ea6c0a5..9ba11ceaaabc8185de7afc6dfeeeda34671a482d 100755 (executable)
--- a/drivers/video/omap2/dsscomp/gralloc.c
+++ b/drivers/video/omap2/dsscomp/gralloc.c
@@ -355,7 +355,7 @@ int dsscomp_gralloc_queue(struct dsscomp_setup_dispc_data *d,
                        int fb_ix = (oi->ba >> 28);
                        int fb_uv_ix = (oi->uv >> 28);
                        struct fb_info *fbi = NULL, *fbi_uv = NULL;
                        int fb_ix = (oi->ba >> 28);
                        int fb_uv_ix = (oi->uv >> 28);
                        struct fb_info *fbi = NULL, *fbi_uv = NULL;

-                       size_t size = oi->cfg.height * oi->cfg.stride;
+                       size_t hs_size = oi->cfg.height * oi->cfg.stride;

                        if (fb_ix >= num_registered_fb ||
                            (oi->cfg.color_mode == OMAP_DSS_COLOR_NV12 &&
                             fb_uv_ix >= num_registered_fb)) {
                        if (fb_ix >= num_registered_fb ||
                            (oi->cfg.color_mode == OMAP_DSS_COLOR_NV12 &&
                             fb_uv_ix >= num_registered_fb)) {


@@ -368,9 +368,9 @@ int dsscomp_gralloc_queue(struct dsscomp_setup_dispc_data *d,
                        if (oi->cfg.color_mode == OMAP_DSS_COLOR_NV12)
                                fbi_uv = registered_fb[fb_uv_ix];
 
                        if (oi->cfg.color_mode == OMAP_DSS_COLOR_NV12)
                                fbi_uv = registered_fb[fb_uv_ix];
 

-                       if (size + oi->ba > fbi->fix.smem_len ||
+                       if (hs_size + oi->ba > fbi->fix.smem_len ||

                            (oi->cfg.color_mode == OMAP_DSS_COLOR_NV12 &&
                            (oi->cfg.color_mode == OMAP_DSS_COLOR_NV12 &&

-                            (size >> 1) + oi->uv > fbi_uv->fix.smem_len)) {
+                            (hs_size >> 1) + oi->uv > fbi_uv->fix.smem_len)) {

                                WARN(1, "image outside of framebuffer memory");
                                goto skip_buffer;
                        }
                                WARN(1, "image outside of framebuffer memory");
                                goto skip_buffer;
                        }


@@ -577,10 +577,11 @@ void dsscomp_dbg_gralloc(struct seq_file *s)
                                if (!c->extra_cb || c->extra_cb_data != g)
                                        continue;
                                if (i < c->dbg_used) {
                                if (!c->extra_cb || c->extra_cb_data != g)
                                        continue;
                                if (i < c->dbg_used) {

-                                       u32 t = c->dbg_log[i].t;
+                                       u32 dbg_t = c->dbg_log[i].t;

                                        u32 state = c->dbg_log[i].state;
                                        seq_printf(s, "| % 6d.%03d %7s ",
                                        u32 state = c->dbg_log[i].state;
                                        seq_printf(s, "| % 6d.%03d %7s ",

-                                                       t / 1000, t % 1000,
+                                                       dbg_t / 1000,
+                                                       dbg_t % 1000,

                                                        log_state_str(state));
                                        go |= c->dbg_used > i + 1;
                                } else {
                                                        log_state_str(state));
                                        go |= c->dbg_used > i + 1;
                                } else {