[U-Boot] [PATCH 5/7] GCC4.6: Squash warnings in lcd.c

Marek Vasut
2011-09-26T00:26:04Z

lcd.c: In function ?lcd_drawchars?:
lcd.c:214:9: warning: variable ?off? set but not used
[-Wunused-but-set-variable]
lcd.c: In function ?lcd_display_bitmap?:
lcd.c:617:16: warning: variable ?compression? set but not used
[-Wunused-but-set-variable]

Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
---
common/lcd.c | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/common/lcd.c b/common/lcd.c
index 0555ab4..d9cb8ca 100644
--- a/common/lcd.c
+++ b/common/lcd.c
@@ -211,10 +211,13 @@ void lcd_printf(const char *fmt, ...)
static void lcd_drawchars (ushort x, ushort y, uchar *str, int count)
{
uchar *dest;
- ushort off, row;
+ ushort row;
+
+#if LCD_BPP == LCD_MONOCHROME
+ ushort off = x * (1 << LCD_BPP) % 8;
+#endif

dest = (uchar *)(lcd_base + y * lcd_line_length + x * (1 << LCD_BPP) / 8);
- off = x * (1 << LCD_BPP) % 8;

for (row=0; row < VIDEO_FONT_HEIGHT; ++row, dest += lcd_line_length) {
uchar *s = str;
@@ -614,7 +617,6 @@ int lcd_display_bitmap(ulong bmp_image, int x, int y)
unsigned long width, height, byte_width;
unsigned long pwidth = panel_info.vl_col;
unsigned colors, bpix, bmp_bpix;
- unsigned long compression;
#if defined CONFIG_PXA250 || defined CONFIG_PXA27X || defined CONFIG_CPU_MONAHANS
struct pxafb_info *fbi = &panel_info.pxa;
#elif defined(CONFIG_MPC823)
@@ -632,7 +634,6 @@ int lcd_display_bitmap(ulong bmp_image, int x, int y)
height = le32_to_cpu (bmp->header.height);
bmp_bpix = le16_to_cpu(bmp->header.bit_count);
colors = 1 << bmp_bpix;
- compression = le32_to_cpu (bmp->header.compression);

bpix = NBITS(panel_info.vl_bpix);

--
1.7.5.4