[2.5 patch] fix drivers/char/sx.c __FUNCTION__ breakage

[2.5 patch] fix drivers/char/sx.c __FUNCTION__ breakage

[Adrian Bunk]

Hi Roger,

I got the following compile error in 2.5.37:

<--  snip  -->

...
  gcc -Wp,-MD,./.sx.o.d -D__KERNEL__
-I/home/bunk/linux/kernel-2.5/linux-2.5.37-
full/include -Wall -Wstrict-prototypes -Wno-trigraphs -O2
-fomit-frame-pointer -fno-strict-aliasing -fno-common -pipe -mpreferred-stack-boundary=2
-march=k6 -I/home/bunk/linux/kernel-2.5/linux-2.5.37-full/arch/i386/mach-generic
-nostdinc -iwithprefix include    -DKBUILD_BASENAME=sx   -c -o sx.o sx.c
sx.c: In function `sx_busy_wait_eq':
sx.c:521: called object is not a function
sx.c:521: parse error before string constant
...
make[2]: *** [sx.o] Error 1
make[2]: Leaving directory
`/home/bunk/linux/kernel-2.5/linux-2.5.37-full/drivers/char'

<--  snip  -->

The following patch fixes it:

--- linux-2.5.37-full/drivers/char/sx.c.old	2002-09-21 21:15:08.000000000 +0200
+++ linux-2.5.37-full/drivers/char/sx.c	2002-09-21 21:23:23.000000000 +0200
@@ -405,11 +405,11 @@



-#define func_enter() sx_dprintk (SX_DEBUG_FLOW, "sx: enter " __FUNCTION__ "\n")
-#define func_exit()  sx_dprintk (SX_DEBUG_FLOW, "sx: exit  " __FUNCTION__ "\n")
+#define func_enter() sx_dprintk (SX_DEBUG_FLOW, "sx: enter %s\n", __FUNCTION__)
+#define func_exit()  sx_dprintk (SX_DEBUG_FLOW, "sx: exit  %s\n", __FUNCTION__)

-#define func_enter2() sx_dprintk (SX_DEBUG_FLOW, "sx: enter " __FUNCTION__ \
-                                  "(port %d)\n", port->line)
+#define func_enter2() sx_dprintk (SX_DEBUG_FLOW, "sx: enter %s (port %d)\n", \
+                                  __FUNCTION__ , port->line)




cu
Adrian

-- 

You only think this is a free country. Like the US the UK spends a lot of
time explaining its a free country because its a police state.
								Alan Cox

Re: [2.5 patch] fix drivers/char/sx.c __FUNCTION__ breakage

[acme]

Quoting Adrian Bunk <bunk@fs.tum.de>: 
 
> Hi Roger, 
>  
> I got the following compile error in 2.5.37: 
 
I already submitted this and some other janitorial fixes to Linus and Rogier. 
 
- Arnaldo