On Thu, Nov 17, 2011 at 12:49:24PM +0200, Emeltchenko Andrei wrote: > From: Andrew Morton <akpm@xxxxxxxxxx> > > 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 Gustavo, please apply the patch otherwise bluetooth-next is not compiling (with dynamic debug) Best regards Andrei Emeltchenko > > etc > > So remove that #define and "open-code" it. > > Cc: Philip Blundell <philb@xxxxxxx> > Cc: David Miller <davem@xxxxxxxxxxxxx> > Cc: Jason Baron <jbaron@xxxxxxxxxx> > Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> > Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx> > --- > drivers/net/ethernet/i825xx/3c505.c | 6 ++---- > 1 files changed, 2 insertions(+), 4 deletions(-) > > diff --git a/drivers/net/ethernet/i825xx/3c505.c b/drivers/net/ethernet/i825xx/3c505.c > index 40e1a17..ba82a26 100644 > --- a/drivers/net/ethernet/i825xx/3c505.c > +++ b/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..." > > -- > 1.7.4.1 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in > the body of a message to majordomo@xxxxxxxxxxxxxxx > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
