Skip to contentSkip to conversation

net: ethernet: broadcom: bnx2x: Remove redundant #ifdef

PATCH In review Rasmus Villemoes 2 participants 4 messages Aug 20, 2014 – Aug 22, 2014

Subsystems (3)
Networking Network drivers Broadcom BNX2X 10 gigabit Ethernet driver
lore
Share & tools
lore

Rasmus Villemoes

author
#0 lore raw

PATCH 1/1 net: ethernet: broadcom: bnx2x: Remove redundant #ifdef

Nothing defines _ASM_GENERIC_INT_L64_H, it is a weird way to check for 64 bit longs, and u64 should be printed using %llx anyway.

Signed-off-by Rasmus Villemoes <[email protected]>
---
 drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 4 ----
 1 file changed, 4 deletions(-)
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c +0 -4
index 4e6c82e..4ccc806 100644
@@ -483,11 +483,7 @@ static void bnx2x_tpa_start(struct bnx2x_fastpath *fp, u16 queue,
 
 #ifdef BNX2X_STOP_ON_ERROR
 	fp->tpa_queue_used |= (1 << queue);
-#ifdef _ASM_GENERIC_INT_L64_H
-	DP(NETIF_MSG_RX_STATUS, "fp->tpa_queue_used = 0x%lx\n",
-#else
 	DP(NETIF_MSG_RX_STATUS, "fp->tpa_queue_used = 0x%llx\n",
-#endif
 	   fp->tpa_queue_used);
 #endif
 }
Signature · 1 line
1.9.2
maintainer
#1 lore raw

From: Rasmus Villemoes <[email protected]>
Date: Wed, 20 Aug 2014 15:14:49 +0200

Quoted 4 lines

Nothing defines _ASM_GENERIC_INT_L64_H, it is a weird way to check for 64 bit longs, and u64 should be printed using %llx anyway.

Signed-off-by Rasmus Villemoes <[email protected]>

It's not correct and will warn on some platforms where "u64" is just a plain "unsigned long".

Ie. all of those which use include/asm-generic/int-l64.h

I'm not applying this.

author
#2 lore raw
Quoted 6 lines · David Miller

From: Rasmus Villemoes <[email protected]>
Date: Wed, 20 Aug 2014 15:14:49 +0200

Quoted 3 lines

Nothing defines _ASM_GENERIC_INT_L64_H, it is a weird way to check for 64 bit longs, and u64 should be printed using %llx anyway.

Quoted 6 lines
Quoted 1 line
Signed-off-by Rasmus Villemoes <[email protected]>

It's not correct and will warn on some platforms where "u64" is just a plain "unsigned long".

Ie. all of those which use include/asm-generic/int-l64.h

Of which there are none; that file no longer exists (as I said, nothing defines that macro). Please see 0c79a8e2 ("asm/types.h: Remove include/asm-generic/int-l64.h") and 2a7930bd ("Documentation/printk-formats.txt: No casts needed for u64/s64").

Thanks,
Rasmus

maintainer
#3 lore raw

From: Rasmus Villemoes <[email protected]>
Date: Fri, 22 Aug 2014 09:33:07 +0200

Quoted 13 lines
Quoted 11 lines · David Miller

From: Rasmus Villemoes <[email protected]>
Date: Wed, 20 Aug 2014 15:14:49 +0200

Quoted 4 lines

Nothing defines _ASM_GENERIC_INT_L64_H, it is a weird way to check for 64 bit longs, and u64 should be printed using %llx anyway.

Signed-off-by Rasmus Villemoes <[email protected]>

It's not correct and will warn on some platforms where "u64" is just a plain "unsigned long".

Quoted 6 lines
Quoted 1 line

Ie. all of those which use include/asm-generic/int-l64.h

Of which there are none; that file no longer exists (as I said, nothing defines that macro). Please see 0c79a8e2 ("asm/types.h: Remove include/asm-generic/int-l64.h") and 2a7930bd ("Documentation/printk-formats.txt: No casts needed for u64/s64").

Ok that makes sense, applied, thank you.