浏览代码

video: exynos_fb: Make a call to draw_logo only when CONFIG_CMD_BMP is selected

Previously, the call to draw_logo() was happening irrespective
of whether we have selected logo or LCD console.
With this patch we call draw_logo() only when CONFIG_CMD_BMP is selected.

This would even fix the following compilation warning:
exynos_fb.c: In function 'draw_logo':
exynos_fb.c:74:8: warning: variable 'addr' set but not used
[-Wunused-but-set-variable]
exynos_fb.c:73:9: warning: variable 'y' set but not used
[-Wunused-but-set-variable]
exynos_fb.c:73:6: warning: variable 'x' set but not used
[-Wunused-but-set-variable]

Signed-off-by: Ajay Kumar <ajaykumar.rs@samsung.com>
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
Ajay Kumar 12 年之前
父节点
当前提交
e4660e0b73
共有 1 个文件被更改,包括 4 次插入2 次删除
  1. 4 2
      drivers/video/exynos_fb.c

+ 4 - 2
drivers/video/exynos_fb.c

@@ -68,6 +68,7 @@ static void exynos_lcd_init(vidinfo_t *vid)
 	lcd_set_flush_dcache(1);
 	lcd_set_flush_dcache(1);
 }
 }
 
 
+#ifdef CONFIG_CMD_BMP
 static void draw_logo(void)
 static void draw_logo(void)
 {
 {
 	int x, y;
 	int x, y;
@@ -88,10 +89,9 @@ static void draw_logo(void)
 	}
 	}
 
 
 	addr = panel_info.logo_addr;
 	addr = panel_info.logo_addr;
-#ifdef CONFIG_CMD_BMP
 	bmp_display(addr, x, y);
 	bmp_display(addr, x, y);
-#endif
 }
 }
+#endif
 
 
 static void lcd_panel_on(vidinfo_t *vid)
 static void lcd_panel_on(vidinfo_t *vid)
 {
 {
@@ -150,7 +150,9 @@ void lcd_enable(void)
 	if (panel_info.logo_on) {
 	if (panel_info.logo_on) {
 		memset(lcd_base, 0, panel_width * panel_height *
 		memset(lcd_base, 0, panel_width * panel_height *
 				(NBITS(panel_info.vl_bpix) >> 3));
 				(NBITS(panel_info.vl_bpix) >> 3));
+#ifdef CONFIG_CMD_BMP
 		draw_logo();
 		draw_logo();
+#endif
 	}
 	}
 
 
 	lcd_panel_on(&panel_info);
 	lcd_panel_on(&panel_info);