[PATCH] net: ethernet: broadcom: bnx2x: Remove redundant #ifdef

[PATCH] net: ethernet: broadcom: bnx2x: Remove redundant #ifdef

[Rasmus Villemoes]

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 <linux@rasmusvillemoes.dk>
---
 drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
index 4e6c82e..4ccc806 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
@@ -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
 }
-- 
1.9.2

Re: [PATCH] net: ethernet: broadcom: bnx2x: Remove redundant #ifdef

[David Miller]

From: Rasmus Villemoes <linux@rasmusvillemoes.dk>
Date: Wed, 20 Aug 2014 15:14:49 +0200

> 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 <linux@rasmusvillemoes.dk>

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.

Re: [PATCH] net: ethernet: broadcom: bnx2x: Remove redundant #ifdef

[Rasmus Villemoes]

David Miller <davem@davemloft.net> writes:

> From: Rasmus Villemoes <linux@rasmusvillemoes.dk>
> Date: Wed, 20 Aug 2014 15:14:49 +0200
>
>> 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 <linux@rasmusvillemoes.dk>
>
> 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

Re: [PATCH] net: ethernet: broadcom: bnx2x: Remove redundant #ifdef

[David Miller]

From: Rasmus Villemoes <linux@rasmusvillemoes.dk>
Date: Fri, 22 Aug 2014 09:33:07 +0200

> David Miller <davem@davemloft.net> writes:
> 
>> From: Rasmus Villemoes <linux@rasmusvillemoes.dk>
>> Date: Wed, 20 Aug 2014 15:14:49 +0200
>>
>>> 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 <linux@rasmusvillemoes.dk>
>>
>> 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").

Ok that makes sense, applied, thank you.