2009-12-15 05:22:11

by Peter Huewe

Subject: [PATCH] Fix compilation error of drivers/staging/panel/panel.c w/ custom lcd charset

When compiling panel.c with a DEFAULT_LCD_CHARSET it fails to compile
with the following error message:
drivers/staging/panel/panel.c: In function >>lcd_init<<:
drivers/staging/panel/panel.c:1396: error: expected expression before
>>;<< token
drivers/staging/panel/panel.c:1475: error: expected expression before
>>;<< token
make[3]: *** [drivers/staging/panel/panel.o] error 1
make[2]: *** [drivers/staging/panel] error 2
make[1]: *** [drivers/staging] error 2

The config used was:
CONFIG_PANEL=m
CONFIG_PANEL_PARPORT=0
CONFIG_PANEL_PROFILE=0
CONFIG_PANEL_KEYPAD=0
CONFIG_PANEL_LCD=1
CONFIG_PANEL_LCD_HEIGHT=2
CONFIG_PANEL_LCD_WIDTH=20
CONFIG_PANEL_LCD_BWIDTH=40
CONFIG_PANEL_LCD_HWIDTH=64
CONFIG_PANEL_LCD_CHARSET=0
CONFIG_PANEL_LCD_PROTO=0
CONFIG_PANEL_LCD_PIN_E=14
CONFIG_PANEL_LCD_PIN_RS=17
CONFIG_PANEL_LCD_PIN_RW=16
CONFIG_PANEL_LCD_PIN_BL=0

This patch fixes both errors, as it fixes the define
Patch against current linux-next tree at Tue Dec 15 06:07:01 2009 +0100

Signed-off-by: Peter Huewe <[email protected]>
---
drivers/staging/panel/panel.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/staging/panel/panel.c b/drivers/staging/panel/panel.c
index f98a524..95c93e8 100644
--- a/drivers/staging/panel/panel.c
+++ b/drivers/staging/panel/panel.c
@@ -378,7 +378,7 @@ static unsigned char lcd_bits[LCD_PORTS][LCD_BITS][BIT_STATES];

#ifdef CONFIG_PANEL_LCD_CHARSET
#undef DEFAULT_LCD_CHARSET
-#define DEFAULT_LCD_CHARSET
+#define DEFAULT_LCD_CHARSET CONFIG_PANEL_LCD_CHARSET
#endif

#endif /* DEFAULT_PROFILE == 0 */
--
1.6.4.4

2009-12-15 21:20:09

by Willy Tarreau

Subject: Re: [PATCH] Fix compilation error of drivers/staging/panel/panel.c w/ custom lcd charset

On Tue, Dec 15, 2009 at 06:21:45AM +0100, Peter Huewe wrote:
> When compiling panel.c with a DEFAULT_LCD_CHARSET it fails to compile
> with the following error message:
> drivers/staging/panel/panel.c: In function >>lcd_init<<:
> drivers/staging/panel/panel.c:1396: error: expected expression before
> >>;<< token
> drivers/staging/panel/panel.c:1475: error: expected expression before
> >>;<< token
> make[3]: *** [drivers/staging/panel/panel.o] error 1
> make[2]: *** [drivers/staging/panel] error 2
> make[1]: *** [drivers/staging] error 2

(...)
> #ifdef CONFIG_PANEL_LCD_CHARSET
> #undef DEFAULT_LCD_CHARSET
> -#define DEFAULT_LCD_CHARSET
> +#define DEFAULT_LCD_CHARSET CONFIG_PANEL_LCD_CHARSET
> #endif

Wow! I don't understand how this managed to slip through the various
tests for that long. That code is the the same in my 2.4 driver too,
so that means it has never worked for the last 5 years !

Obvious ACK from me, but please take a quick look at the place
where this define is used to ensure that any expected setting of
CONFIG_PANEL_LCD_CHARSET will not result in some other cryptic
error messages being sent to the user.

Thanks!
Willy