video: Fix compilation warnings for exynos video

PATCH New Ajay Kumar 4 participants 8 messages Jan 14, 2013 – Jan 22, 2013

Subsystems (2)

Framebuffer layer Arm Samsung Exynos

lore

Share & tools

lore

Ajay Kumar

author

2013-01-14 09:32 UTC #0 lore raw

cover video: Fix compilation warnings for exynos video

This patchset fixes the following compilation warnings:
exynos_dp.c: In function 'exynos_init_dp':
exynos_dp.c:860:23: warning: variable 'disp_info' set but not used [-Wunused-but-set-variable]
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]

[PATCH 1/2] video: exynos_dp: Remove unused variable disp_info [PATCH 2/2] video: exynos_fb: Make a call to draw_logo only when CONFIG_CMD_BMP
is selected

 drivers/video/exynos_dp.c | 2 --
 drivers/video/exynos_fb.c | 6 ++++--
 2 files changed, 4 insertions(+), 4 deletions(-)

Signature · 1 line

1.8.0

Ajay Kumar

author

2013-01-14 09:32 UTC #1 lore raw

PATCH 1/2 video: exynos_dp: Remove unused variable disp_info

Remove unused variable disp_info to fix the following compilation warning:
exynos_dp.c: In function 'exynos_init_dp':
exynos_dp.c:860:23: warning: variable 'disp_info' set but not used [-Wunused-but-set-variable]

Signed-off-by Ajay Kumar <[email protected]>

---
 drivers/video/exynos_dp.c | 2 --
 1 file changed, 2 deletions(-)

drivers/video/exynos_dp.c +0 -2

index 53e4101..d72fa56 100644
@@ -857,7 +857,6 @@ unsigned int exynos_init_dp(void)
 {
 	unsigned int ret;
 	struct edp_device_info *edp_info;
-	struct edp_disp_info disp_info;
 
 	edp_info = kzalloc(sizeof(struct edp_device_info), GFP_KERNEL);
 	if (!edp_info) {

@@ -870,7 +869,6 @@ unsigned int exynos_init_dp(void)
 		debug("failed to get edp_info data.\n");
 		return -EFAULT;
 	}
-	disp_info = edp_info->disp_info;
 
 	exynos_dp_disp_info(&edp_info->disp_info);

Signature · 1 line

1.8.0

Simon Glass

2013-01-22 13:38 UTC #2 lore raw

PATCH 1/2 video: exynos_dp: Remove unused variable disp_info

Quoted 6 lines · Ajay Kumar

Remove unused variable disp_info to fix the following compilation warning:
exynos_dp.c: In function 'exynos_init_dp':
exynos_dp.c:860:23: warning: variable 'disp_info' set but not used [-Wunused-but-set-variable]
Signed-off-by Ajay Kumar <[email protected]>

Acked-by Simon Glass <[email protected]>

Quoted 27 lines

---
 drivers/video/exynos_dp.c | 2 --
 1 file changed, 2 deletions(-)

drivers/video/exynos_dp.c +0 -3

index 53e4101..d72fa56 100644
@@ -857,7 +857,6 @@ unsigned int exynos_init_dp(void)
 {
        unsigned int ret;
        struct edp_device_info *edp_info;
-       struct edp_disp_info disp_info;
 
        edp_info = kzalloc(sizeof(struct edp_device_info), GFP_KERNEL);
        if (!edp_info) {

@@ -870,7 +869,6 @@ unsigned int exynos_init_dp(void)
                debug("failed to get edp_info data.\n");
                return -EFAULT;
        }
-       disp_info = edp_info->disp_info;
 
        exynos_dp_disp_info(&edp_info->disp_info);
 
--

1.8.0

Ajay Kumar

author

2013-01-14 09:32 UTC #3 lore raw

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

In reply to Ajay Kumar

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 <[email protected]>

---
 drivers/video/exynos_fb.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

drivers/video/exynos_fb.c +4 -2

index 183bca0..ee0ed06 100644
@@ -68,6 +68,7 @@ static void exynos_lcd_init(vidinfo_t *vid)
 	lcd_set_flush_dcache(1);
 }
 
+#ifdef CONFIG_CMD_BMP
 static void draw_logo(void)
 {
 	int x, y;

@@ -88,10 +89,9 @@ static void draw_logo(void)
 	}
 
 	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 @@ void lcd_enable(void)
 	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);

Signature · 1 line

1.8.0

Simon Glass

2013-01-22 13:43 UTC #4 lore raw

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

Hi Ajay,

Quoted 43 lines · Ajay Kumar

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 <[email protected]>
---
 drivers/video/exynos_fb.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/video/exynos_fb.c +2 -2
index 183bca0..ee0ed06 100644
@@ -68,6 +68,7 @@ static void exynos_lcd_init(vidinfo_t *vid)
        lcd_set_flush_dcache(1);
 }
 
+#ifdef CONFIG_CMD_BMP
 static void draw_logo(void)
 {
        int x, y;
@@ -88,10 +89,9 @@ static void draw_logo(void)
        }
 
        addr = panel_info.logo_addr;
-#ifdef CONFIG_CMD_BMP
        bmp_display(addr, x, y);
-#endif
 }
+#endif
 
 static void lcd_panel_on(vidinfo_t *vid)
 {

drivers/video/exynos_fb.c void lcd_enable(void) · line 155

Quoted 6 lines

drivers/video/exynos_fb.c +2 -0

@@ -150,7 +150,9 @@ void lcd_enable(void)
        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

It would be nice to avoid another #ifdef. Would it be possible instead to make the first #ifdef cover the whole internals of the draw_logo() function?

Quoted 6 lines

drivers/video/exynos_fb.c +0 -1

        }
 
        lcd_panel_on(&panel_info);
--

1.8.0

Regards,
Simon

Ajay kumar

2013-01-22 14:11 UTC #5 lore raw

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

Hi Simon,

Quoted 43 lines · Simon Glass

Hi Ajay,
Quoted 40 lines · Ajay Kumar
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 <[email protected]>
---
 drivers/video/exynos_fb.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/video/exynos_fb.c +2 -2
index 183bca0..ee0ed06 100644
@@ -68,6 +68,7 @@ static void exynos_lcd_init(vidinfo_t *vid)
        lcd_set_flush_dcache(1);
 }
 
+#ifdef CONFIG_CMD_BMP
 static void draw_logo(void)
 {
        int x, y;
@@ -88,10 +89,9 @@ static void draw_logo(void)
        }
 
        addr = panel_info.logo_addr;
-#ifdef CONFIG_CMD_BMP
        bmp_display(addr, x, y);
-#endif
 }
+#endif
 

Quoted 13 lines

drivers/video/exynos_fb.c void lcd_enable(void) · line 155
Quoted 9 lines
drivers/video/exynos_fb.c +2 -0
 static void lcd_panel_on(vidinfo_t *vid)
 {
@@ -150,7 +150,9 @@ void lcd_enable(void)
        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
It would be nice to avoid another #ifdef. Would it be possible instead to make the first #ifdef cover the whole internals of the draw_logo() function?

This patchset has already been merged!

Quoted 9 lines

Quoted 6 lines
drivers/video/exynos_fb.c +0 -1
        }
 
        lcd_panel_on(&panel_info);
--
1.8.0
Regards,
Simon

Regards,
Ajay

Simon Glass

2013-01-22 14:13 UTC #6 lore raw

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

Hi Ajay,

Quoted 59 lines · Ajay kumar

Hi Simon,
Quoted 43 lines · Simon Glass
Hi Ajay,
Quoted 40 lines · Ajay Kumar
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 <[email protected]>
---
 drivers/video/exynos_fb.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/video/exynos_fb.c +2 -2
index 183bca0..ee0ed06 100644
@@ -68,6 +68,7 @@ static void exynos_lcd_init(vidinfo_t *vid)
        lcd_set_flush_dcache(1);
 }
 
+#ifdef CONFIG_CMD_BMP
 static void draw_logo(void)
 {
        int x, y;
@@ -88,10 +89,9 @@ static void draw_logo(void)
        }
 
        addr = panel_info.logo_addr;
-#ifdef CONFIG_CMD_BMP
        bmp_display(addr, x, y);
-#endif
 }
+#endif
 
Quoted 13 lines
drivers/video/exynos_fb.c void lcd_enable(void) · line 155
Quoted 9 lines
drivers/video/exynos_fb.c +2 -0
 static void lcd_panel_on(vidinfo_t *vid)
 {
@@ -150,7 +150,9 @@ void lcd_enable(void)
        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
It would be nice to avoid another #ifdef. Would it be possible instead to make the first #ifdef cover the whole internals of the draw_logo() function?

Quoted 1 line

This patchset has already been merged!

No problem - I have been away for a week and didn't see the 'applied' response.

Quoted 8 lines

Quoted 8 lines
Quoted 7 lines
drivers/video/exynos_fb.c +0 -1
        }
 
        lcd_panel_on(&panel_info);
--
1.8.0

Quoted 5 lines

Quoted 2 lines
Regards,
Simon
Regards,
Ajay

Regards,
Simon

Minkyu Kang

2013-01-14 10:22 UTC #7 lore raw

cover video: Fix compilation warnings for exynos video

In reply to Ajay Kumar

Quoted 13 lines · Ajay Kumar

This patchset fixes the following compilation warnings:
exynos_dp.c: In function 'exynos_init_dp':
exynos_dp.c:860:23: warning: variable 'disp_info' set but not used [-Wunused-but-set-variable]
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]

Quoted 8 lines

[PATCH 1/2] video: exynos_dp: Remove unused variable disp_info [PATCH 2/2] video: exynos_fb: Make a call to draw_logo only when CONFIG_CMD_BMP
is selected
 drivers/video/exynos_dp.c | 2 --
 drivers/video/exynos_fb.c | 6 ++++--
 2 files changed, 4 insertions(+), 4 deletions(-)

applied to u-boot-samsung.

Thanks,
Minkyu Kang.