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>

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 · Minkyu Kang
1 parent 02a58b9340
Showing 1 changed file with 4 additions and 2 deletions Side-by-side Diff
drivers/video/exynos_fb.c
@@ -68,6 +68,7 @@
 	lcd_set_flush_dcache(1);
 }
  
+#ifdef CONFIG_CMD_BMP
 static void draw_logo(void)
 {
 	int x, y;
  
  
@@ -88,10 +89,9 @@
 	}
  
 	addr = panel_info.logo_addr;
-#ifdef CONFIG_CMD_BMP
 	bmp_display(addr, x, y);
-#endif
 }
+#endif
  
 static void lcd_panel_on(vidinfo_t *vid)
 {
  
@@ -150,7 +150,9 @@
 	if (panel_info.logo_on) {
 		memset(lcd_base, 0, panel_width * panel_height *
 				(NBITS(panel_info.vl_bpix) >> 3));
+#ifdef CONFIG_CMD_BMP
 		draw_logo();
+#endif
 	}
  
 	lcd_panel_on(&panel_info);
...	...	@@ -68,6 +68,7 @@
68	68	lcd_set_flush_dcache(1);
69	69	}
70	70
	71	+#ifdef CONFIG_CMD_BMP
71	72	static void draw_logo(void)
72	73	{
73	74	int x, y;
74	75
75	76
...	...	@@ -88,10 +89,9 @@
88	89	}
89	90
90	91	addr = panel_info.logo_addr;
91		-#ifdef CONFIG_CMD_BMP
92	92	bmp_display(addr, x, y);
93		-#endif
94	93	}
	94	+#endif
95	95
96	96	static void lcd_panel_on(vidinfo_t *vid)
97	97	{
98	98
...	...	@@ -150,7 +150,9 @@
150	150	if (panel_info.logo_on) {
151	151	memset(lcd_base, 0, panel_width * panel_height *
152	152	(NBITS(panel_info.vl_bpix) >> 3));
	153	+#ifdef CONFIG_CMD_BMP
153	154	draw_logo();
	155	+#endif
154	156	}
155	157
156	158	lcd_panel_on(&panel_info);