Patchwork [1/1] drivers/net/ethernet/i825xx/3c505.c: fix build with dynamic debug

login
register
mail settings
Submitter Andrew Morton
Date Oct. 31, 2011, 7:54 p.m.
Message ID <201110311954.p9VJs9VO002313@hpaq3.eem.corp.google.com>
Download mbox | patch
Permalink /patch/122930/
State Accepted
Delegated to: David Miller
Headers show

Comments

Andrew Morton - Oct. 31, 2011, 7:54 p.m.
From: Andrew Morton <akpm@google.com>
Subject: drivers/net/ethernet/i825xx/3c505.c: fix build with dynamic debug

The `#define filename' screws up the expansion of
DEFINE_DYNAMIC_DEBUG_METADATA:

drivers/net/ethernet/i825xx/3c505.c: In function 'send_pcb':
drivers/net/ethernet/i825xx/3c505.c:390: error: expected identifier before string constant
drivers/net/ethernet/i825xx/3c505.c:390: error: expected '}' before '.' token
drivers/net/ethernet/i825xx/3c505.c:436: error: expected identifier before string constant
drivers/net/ethernet/i825xx/3c505.c:435: error: expected '}' before '.' token
drivers/net/ethernet/i825xx/3c505.c: In function 'start_receive':
drivers/net/ethernet/i825xx/3c505.c:557: error: expected identifier before string constant
drivers/net/ethernet/i825xx/3c505.c:557: error: expected '}' before '.' token
drivers/net/ethernet/i825xx/3c505.c: In function 'receive_packet':
drivers/net/ethernet/i825xx/3c505.c:629: error: expected identifier before string constant

etc

So remove that #define and "open-code" it.

Cc: Philip Blundell <philb@gnu.org>
Cc: David Miller <davem@davemloft.net>
Cc: Jason Baron <jbaron@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/net/ethernet/i825xx/3c505.c |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
David Miller - Nov. 1, 2011, 4:54 a.m.
From: akpm@linux-foundation.org
Date: Mon, 31 Oct 2011 12:54:09 -0700

> From: Andrew Morton <akpm@google.com>
> Subject: drivers/net/ethernet/i825xx/3c505.c: fix build with dynamic debug
> 
> The `#define filename' screws up the expansion of
> DEFINE_DYNAMIC_DEBUG_METADATA:
> 
> drivers/net/ethernet/i825xx/3c505.c: In function 'send_pcb':
> drivers/net/ethernet/i825xx/3c505.c:390: error: expected identifier before string constant
> drivers/net/ethernet/i825xx/3c505.c:390: error: expected '}' before '.' token
> drivers/net/ethernet/i825xx/3c505.c:436: error: expected identifier before string constant
> drivers/net/ethernet/i825xx/3c505.c:435: error: expected '}' before '.' token
> drivers/net/ethernet/i825xx/3c505.c: In function 'start_receive':
> drivers/net/ethernet/i825xx/3c505.c:557: error: expected identifier before string constant
> drivers/net/ethernet/i825xx/3c505.c:557: error: expected '}' before '.' token
> drivers/net/ethernet/i825xx/3c505.c: In function 'receive_packet':
> drivers/net/ethernet/i825xx/3c505.c:629: error: expected identifier before string constant
> 
> etc
> 
> So remove that #define and "open-code" it.
> 
> Cc: Philip Blundell <philb@gnu.org>
> Cc: David Miller <davem@davemloft.net>
> Cc: Jason Baron <jbaron@redhat.com>
> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

Applied.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff -puN drivers/net/ethernet/i825xx/3c505.c~drivers-net-ethernet-i825xx-3c505c-fix-build-with-dynamic-debug drivers/net/ethernet/i825xx/3c505.c
--- a/drivers/net/ethernet/i825xx/3c505.c~drivers-net-ethernet-i825xx-3c505c-fix-build-with-dynamic-debug
+++ a/drivers/net/ethernet/i825xx/3c505.c
@@ -126,15 +126,13 @@ 
  *
  *********************************************************/
 
-#define filename __FILE__
-
 #define timeout_msg "*** timeout at %s:%s (line %d) ***\n"
 #define TIMEOUT_MSG(lineno) \
-	pr_notice(timeout_msg, filename, __func__, (lineno))
+	pr_notice(timeout_msg, __FILE__, __func__, (lineno))
 
 #define invalid_pcb_msg "*** invalid pcb length %d at %s:%s (line %d) ***\n"
 #define INVALID_PCB_MSG(len) \
-	pr_notice(invalid_pcb_msg, (len), filename, __func__, __LINE__)
+	pr_notice(invalid_pcb_msg, (len), __FILE__, __func__, __LINE__)
 
 #define search_msg "%s: Looking for 3c505 adapter at address %#x..."