[PATCH 2.4] R8169: Fix compilation error when RTL8169_DEBUG is defined

[PATCH 2.4] R8169: Fix compilation error when RTL8169_DEBUG is defined

[Jaswinder Singh Rajput]

Fixed following compilations error :
r8169.c: In function `rtl8169_print_mac_version':
r8169.c:458: parse error before '}' token
r8169.c:462: parse error before '}' token
r8169.c: In function `rtl8169_print_phy_version':
r8169.c:501: parse error before '}' token
r8169.c:505: parse error before '}' token
r8169.c: In function `rtl8169_hw_phy_config':
r8169.c:552: parse error before '}' token
r8169.c:553: parse error before '}' token
r8169.c: In function `rtl8169_init_one':
r8169.c:880: parse error before '}' token
r8169.c:884: parse error before '}' token
r8169.c:889: parse error before '}' token
r8169.c:891: parse error before '}' token
r8169.c: In function `rtl8169_hw_start':
r8169.c:1136: parse error before '}' token
make[2]: *** [r8169.o] Error 1

Signed-off-by: Jaswinder Singh Rajput <jaswinderrajput@gmail.com>
---
 drivers/net/r8169.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
index 8c7c202..5b00173 100644
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
@@ -63,7 +63,8 @@ VERSION 1.2	<2002/11/30>
 	        printk( "Assertion failed! %s,%s,%s,line=%d\n",	\
         	#expr,__FILE__,__FUNCTION__,__LINE__);		\
         }
-#define dprintk(fmt, args...)	do { printk(PFX fmt, ## args) } while (0)
+#define dprintk(fmt, args...) \
+	do { printk(KERN_DEBUG PFX fmt, ## args); } while (0)
 #else
 #define assert(expr) do {} while (0)
 #define dprintk(fmt, args...)	do {} while (0)
@@ -1131,7 +1132,7 @@ rtl8169_hw_start(struct net_device *dev)
 	RTL_W16(CPlusCmd, tp->cp_cmd);
 
 	if (tp->mac_version == RTL_GIGA_MAC_VER_D) {
-		dprintk(KERN_INFO PFX "Set MAC Reg C+CR Offset 0xE0: bit-3 and bit-14 MUST be 1\n");
+		dprintk("Set MAC Reg C+CR Offset 0xE0: bit-3 and bit-14 MUST be 1\n");
 		tp->cp_cmd |= (1 << 14) | PCIMulRW;
 		RTL_W16(CPlusCmd, tp->cp_cmd);
 	}
-- 
1.6.1.GIT

Re: [PATCH 2.4] R8169: Fix compilation error when RTL8169_DEBUG is defined

[Willy Tarreau]

Hi Jaswinder,

On Wed, Oct 21, 2009 at 04:07:58PM +0530, Jaswinder Singh Rajput wrote:
> 
> Fixed following compilations error :
> r8169.c: In function `rtl8169_print_mac_version':
> r8169.c:458: parse error before '}' token
> r8169.c:462: parse error before '}' token
> r8169.c: In function `rtl8169_print_phy_version':
> r8169.c:501: parse error before '}' token
> r8169.c:505: parse error before '}' token
> r8169.c: In function `rtl8169_hw_phy_config':
> r8169.c:552: parse error before '}' token
> r8169.c:553: parse error before '}' token
> r8169.c: In function `rtl8169_init_one':
> r8169.c:880: parse error before '}' token
> r8169.c:884: parse error before '}' token
> r8169.c:889: parse error before '}' token
> r8169.c:891: parse error before '}' token
> r8169.c: In function `rtl8169_hw_start':
> r8169.c:1136: parse error before '}' token
> make[2]: *** [r8169.o] Error 1
> 
> Signed-off-by: Jaswinder Singh Rajput <jaswinderrajput@gmail.com>
> ---
>  drivers/net/r8169.c |    5 +++--
>  1 files changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
> index 8c7c202..5b00173 100644
> --- a/drivers/net/r8169.c
> +++ b/drivers/net/r8169.c
> @@ -63,7 +63,8 @@ VERSION 1.2	<2002/11/30>
>  	        printk( "Assertion failed! %s,%s,%s,line=%d\n",	\
>          	#expr,__FILE__,__FUNCTION__,__LINE__);		\
>          }
> -#define dprintk(fmt, args...)	do { printk(PFX fmt, ## args) } while (0)
> +#define dprintk(fmt, args...) \
> +	do { printk(KERN_DEBUG PFX fmt, ## args); } while (0)
>  #else
>  #define assert(expr) do {} while (0)
>  #define dprintk(fmt, args...)	do {} while (0)
> @@ -1131,7 +1132,7 @@ rtl8169_hw_start(struct net_device *dev)
>  	RTL_W16(CPlusCmd, tp->cp_cmd);
>  
>  	if (tp->mac_version == RTL_GIGA_MAC_VER_D) {
> -		dprintk(KERN_INFO PFX "Set MAC Reg C+CR Offset 0xE0: bit-3 and bit-14 MUST be 1\n");
> +		dprintk("Set MAC Reg C+CR Offset 0xE0: bit-3 and bit-14 MUST be 1\n");
>  		tp->cp_cmd |= (1 << 14) | PCIMulRW;
>  		RTL_W16(CPlusCmd, tp->cp_cmd);
>  	}

Your fix is obviously right, I'm merging it.

Thanks!
Willy