2.6.29-rc3-git5 build failure : drivers/staging/panel
2.6.29-rc3-git5 randconfig build on powerpc fails with following error
CALL arch/powerpc/kernel/systbl_chk.sh CALL arch/powerpc/kernel/prom_init_check.sh CC [M] drivers/staging/panel/panel.o
drivers/staging/panel/panel.c:625: error: conflicting types for set_bits /home/sachin/linux-2.6.29-rc3-git5/arch/powerpc/include/asm/bitops.h:216: error: previous definition of set_bits was here make[3]: *** [drivers/staging/panel/panel.o] Error 1
make[2]: *** [drivers/staging/panel] Error 2
make[1]: *** [drivers/staging] Error 2
make: *** [drivers] Error 2
Will provide .config if required.
Thanks
-Sachin
Signature · 6 lines
--------------------------------- Sachin Sant IBM Linux Technology Center India Systems and Technology Labs Bangalore, India ---------------------------------
PATCH 1/1 fix lcd panel driver build failure
In reply to Willy Tarreau* Fix build break for lcd panel driver.
---
* Fix build break for lcd panel driver.
---
drivers/staging/panel/panel.c +5 -5
@@ -622,7 +622,7 @@ static int set_ctrl_bits(void) }/* sets ctrl & data port bits according to current signals values */ -static void set_bits (void ) +static void panel_set_bits (void ) {set_data_bits ();set_ctrl_bits ();
@@ -707,12 +707,12 @@ static void lcd_send_serial(int byte)*/ for (bit =0 ; bit <8 ; bit++) { bits.cl =BIT_CLR ;/* CLK low */ -set_bits (); +panel_set_bits (); bits.da = byte &1 ; -set_bits (); +panel_set_bits ();udelay (2 );/* maintain the data during 2 us before CLK up */ bits.cl =BIT_SET ;/* CLK high */ -set_bits (); +panel_set_bits ();udelay (1 );/* maintain the strobe during 1 us */ byte >>=1 ; }
@@ -727,7 +727,7 @@ static void lcd_backlight(int on)/* The backlight is activated by seting the AUTOFEED line to +5V */ spin_lock (&pprt_lock); bits.bl = on; -set_bits (); +panel_set_bits ();spin_unlock (&pprt_lock); }
Hi,
Quoted 13 lines · Sachin P. Sant
2.6.29-rc3-git5 randconfig build on powerpc fails with following error
CALL arch/powerpc/kernel/systbl_chk.sh CALL arch/powerpc/kernel/prom_init_check.sh CC [M] drivers/staging/panel/panel.o
drivers/staging/panel/panel.c:625: error: conflicting types forset_bits/home/sachin/linux-2.6.29-rc3-git5/arch/powerpc/include/asm/bitops.h:216:
error: previous definition ofset_bitswas here
make[3]: *** [drivers/staging/panel/panel.o] Error 1
make[2]: *** [drivers/staging/panel] Error 2
make[1]: *** [drivers/staging] Error 2
make: *** [drivers] Error 2
Quoted 1 line
Will provide .config if required.
I don't think any config will be needed. The problem is that we have conflicting names between global and local functions. Could you please try to rename "set_bits" as weel as the few references to this function in panel.c ? I'd suggest you name it "panel_set_bits".
I can work on a patch if needed, but since the fix is really easy I'd prefer to get a confirmation that it's enough.
Thanks for the report,
Willy
Re: [Patch] fix lcd panel driver build failure
In reply to Sachin P. SantThanks Sachin !
Greg, could you please merge this one into your staging tree ?
Thanks,
Willy
Quoted 3 lines · Sachin P. Sant
* Fix build break for lcd panel driver.
Signed-off-by Sachin Sant <[email protected]>
Quoted 46 lines
---
* Fix build break for lcd panel driver.
Signed-off-by Sachin Sant <[email protected]>---
diff -Naurp
a/drivers/staging/panel/panel.cb/drivers/staging/panel/panel.cdrivers/staging/panel/panel.c +5
-5@@ -622,7 +622,7 @@ static int set_ctrl_bits(void) }/* sets ctrl & data port bits according to current signals values */ -static void set_bits (void ) +static void panel_set_bits (void ) {set_data_bits ();set_ctrl_bits ();@@ -707,12 +707,12 @@ static void lcd_send_serial(int byte)*/ for (bit =0 ; bit <8 ; bit++) { bits.cl =BIT_CLR ;/* CLK low */ -set_bits (); +panel_set_bits (); bits.da = byte &1 ; -set_bits (); +panel_set_bits ();udelay (2 );/* maintain the data during 2 us before CLK up */ bits.cl =BIT_SET ;/* CLK high */ -set_bits (); +panel_set_bits ();udelay (1 );/* maintain the strobe during 1 us */ byte >>=1 ; }@@ -727,7 +727,7 @@ static void lcd_backlight(int on)/* The backlight is activated by seting the AUTOFEED line to +5V */ spin_lock (&pprt_lock); bits.bl = on; -set_bits (); +panel_set_bits ();spin_unlock (&pprt_lock); }
Re: [Patch] fix lcd panel driver build failure
Quoted 3 lines · Willy Tarreau
Thanks Sachin !
Greg, could you please merge this one into your staging tree ?
I will do that, thanks.
greg k-h