OMAPDSS: DSSCOMP: Resolve compiler errors/warnings when CONFIG_DSSCOMP_DEBUG_LOG...

When CONFIG_DSSCOMP_DEBUG_LOG is not set there are two issues

Resolve compiler error:
drivers/video/omap2/dsscomp/base.c: In function 'set_dss_mgr_info':
drivers/video/omap2/dsscomp/base.c:397: error: 'alpha_only' undeclared

Resolve compiler warning:
drivers/video/omap2/dsscomp/gralloc.c: In function 'dsscomp_dbg_gralloc':
drivers/video/omap2/dsscomp/gralloc.c:541: warning: unused variable 'i'

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

diff --git a/drivers/video/omap2/dsscomp/dsscomp.h b/drivers/video/omap2/dsscomp/dsscomp.h
index 5146c1f0bf91d9d56b9bb0e55906ee03faaac344..2adde7dfcf1a8cfc6bc31d79068fde95c1698892 100644 (file)
--- a/drivers/video/omap2/dsscomp/dsscomp.h
+++ b/drivers/video/omap2/dsscomp/dsscomp.h
@@ -191,10 +191,10 @@ extern struct dbg_event_t {
        const char *fmt;
 } dbg_events[128];
 extern u32 dbg_event_ix;
-extern bool alpha_only;
 
 void dsscomp_dbg_events(struct seq_file *s);
 #endif
+extern bool alpha_only;
 
 static inline
 void __log_event(u32 ix, u32 ms, void *data, const char *fmt, u32 a1, u32 a2)

diff --git a/drivers/video/omap2/dsscomp/gralloc.c b/drivers/video/omap2/dsscomp/gralloc.c
index 49dc65d5f6f0630cac3a0654393ca03f0779e72f..676346f9ba44c9f0b7cc813f0d88a1926ea6c0a5 100755 (executable)
--- a/drivers/video/omap2/dsscomp/gralloc.c
+++ b/drivers/video/omap2/dsscomp/gralloc.c
@@ -538,7 +538,9 @@ void dsscomp_dbg_gralloc(struct seq_file *s)
        struct dsscomp_gralloc_t *g;
        struct tiler1d_slot *t;
        struct dsscomp *c;
-       int i;
+#ifdef CONFIG_DSSCOMP_DEBUG_LOG
+               int i;
+#endif
 
        mutex_lock(&dbg_mtx);
        seq_printf(s, "ACTIVE GRALLOC FLIPS\n\n");