* [PATCH] gcc: fix -Warray-compare
@ 2022-05-17 14:19 Martin Liška
2022-05-18 1:50 ` Jakub Kicinski
0 siblings, 1 reply; 4+ messages in thread
From: Martin Liška @ 2022-05-17 14:19 UTC (permalink / raw)
To: netdev, lkml; +Cc: davem, edumazet, kuba, pabeni
Fixes the following GCC warning:
drivers/net/ethernet/sun/cassini.c:1316:29: error: comparison between two arrays [-Werror=array-compare]
drivers/net/ethernet/sun/cassini.c:3783:34: error: comparison between two arrays [-Werror=array-compare]
Signed-off-by: Martin Liska <mliska@suse.cz>
---
drivers/net/ethernet/sun/cassini.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/sun/cassini.c b/drivers/net/ethernet/sun/cassini.c
index b04a6a7bf566..435dc00d04e5 100644
--- a/drivers/net/ethernet/sun/cassini.c
+++ b/drivers/net/ethernet/sun/cassini.c
@@ -1313,7 +1313,7 @@ static void cas_init_rx_dma(struct cas *cp)
writel(val, cp->regs + REG_RX_PAGE_SIZE);
/* enable the header parser if desired */
- if (CAS_HP_FIRMWARE == cas_prog_null)
+ if (&CAS_HP_FIRMWARE[0] == &cas_prog_null[0])
return;
val = CAS_BASE(HP_CFG_NUM_CPU, CAS_NCPUS > 63 ? 0 : CAS_NCPUS);
@@ -3780,7 +3780,7 @@ static void cas_reset(struct cas *cp, int blkflag)
/* program header parser */
if ((cp->cas_flags & CAS_FLAG_TARGET_ABORT) ||
- (CAS_HP_ALT_FIRMWARE == cas_prog_null)) {
+ (&CAS_HP_ALT_FIRMWARE[0] == &cas_prog_null[0])) {
cas_load_firmware(cp, CAS_HP_FIRMWARE);
} else {
cas_load_firmware(cp, CAS_HP_ALT_FIRMWARE);
--
2.36.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] gcc: fix -Warray-compare
2022-05-17 14:19 [PATCH] gcc: fix -Warray-compare Martin Liška
@ 2022-05-18 1:50 ` Jakub Kicinski
2022-05-18 7:18 ` [PATCH v2] eth: sun: cassini: remove dead code Martin Liška
0 siblings, 1 reply; 4+ messages in thread
From: Jakub Kicinski @ 2022-05-18 1:50 UTC (permalink / raw)
To: Martin Liška; +Cc: netdev, lkml, davem, edumazet, pabeni
On Tue, 17 May 2022 16:19:16 +0200 Martin Liška wrote:
> Subject: [PATCH] gcc: fix -Warray-compare
The subject should be more like
eth: sun: cassini: remove dead code
>
> Fixes the following GCC warning:
>
> drivers/net/ethernet/sun/cassini.c:1316:29: error: comparison between two arrays [-Werror=array-compare]
> drivers/net/ethernet/sun/cassini.c:3783:34: error: comparison between two arrays [-Werror=array-compare]
Because AFAICT this comparison will always be true:
#define CAS_HP_ALT_FIRMWARE cas_prog_null
Hopefully DaveM will correct if I'm getting this wrong :)
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH v2] eth: sun: cassini: remove dead code
2022-05-18 1:50 ` Jakub Kicinski
@ 2022-05-18 7:18 ` Martin Liška
2022-05-18 13:10 ` patchwork-bot+netdevbpf
0 siblings, 1 reply; 4+ messages in thread
From: Martin Liška @ 2022-05-18 7:18 UTC (permalink / raw)
To: kuba; +Cc: davem, edumazet, linux-kernel, mliska, netdev, pabeni
Fixes the following GCC warning:
drivers/net/ethernet/sun/cassini.c:1316:29: error: comparison between two arrays [-Werror=array-compare]
drivers/net/ethernet/sun/cassini.c:3783:34: error: comparison between two arrays [-Werror=array-compare]
Note that 2 arrays should be compared by comparing of their addresses:
note: use ‘&cas_prog_workaroundtab[0] == &cas_prog_null[0]’ to compare the addresses
Signed-off-by: Martin Liska <mliska@suse.cz>
---
drivers/net/ethernet/sun/cassini.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/sun/cassini.c b/drivers/net/ethernet/sun/cassini.c
index b04a6a7bf566..435dc00d04e5 100644
--- a/drivers/net/ethernet/sun/cassini.c
+++ b/drivers/net/ethernet/sun/cassini.c
@@ -1313,7 +1313,7 @@ static void cas_init_rx_dma(struct cas *cp)
writel(val, cp->regs + REG_RX_PAGE_SIZE);
/* enable the header parser if desired */
- if (CAS_HP_FIRMWARE == cas_prog_null)
+ if (&CAS_HP_FIRMWARE[0] == &cas_prog_null[0])
return;
val = CAS_BASE(HP_CFG_NUM_CPU, CAS_NCPUS > 63 ? 0 : CAS_NCPUS);
@@ -3780,7 +3780,7 @@ static void cas_reset(struct cas *cp, int blkflag)
/* program header parser */
if ((cp->cas_flags & CAS_FLAG_TARGET_ABORT) ||
- (CAS_HP_ALT_FIRMWARE == cas_prog_null)) {
+ (&CAS_HP_ALT_FIRMWARE[0] == &cas_prog_null[0])) {
cas_load_firmware(cp, CAS_HP_FIRMWARE);
} else {
cas_load_firmware(cp, CAS_HP_ALT_FIRMWARE);
--
2.36.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v2] eth: sun: cassini: remove dead code
2022-05-18 7:18 ` [PATCH v2] eth: sun: cassini: remove dead code Martin Liška
@ 2022-05-18 13:10 ` patchwork-bot+netdevbpf
0 siblings, 0 replies; 4+ messages in thread
From: patchwork-bot+netdevbpf @ 2022-05-18 13:10 UTC (permalink / raw)
To: =?utf-8?b?TWFydGluIExpxaFrYSA8bWxpc2thQHN1c2UuY3o+?=
Cc: kuba, davem, edumazet, linux-kernel, netdev, pabeni
Hello:
This patch was applied to netdev/net-next.git (master)
by David S. Miller <davem@davemloft.net>:
On Wed, 18 May 2022 09:18:53 +0200 you wrote:
> Fixes the following GCC warning:
>
> drivers/net/ethernet/sun/cassini.c:1316:29: error: comparison between two arrays [-Werror=array-compare]
> drivers/net/ethernet/sun/cassini.c:3783:34: error: comparison between two arrays [-Werror=array-compare]
>
> Note that 2 arrays should be compared by comparing of their addresses:
> note: use ‘&cas_prog_workaroundtab[0] == &cas_prog_null[0]’ to compare the addresses
>
> [...]
Here is the summary with links:
- [v2] eth: sun: cassini: remove dead code
https://git.kernel.org/netdev/net-next/c/32329216ca1d
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-05-18 13:10 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-05-17 14:19 [PATCH] gcc: fix -Warray-compare Martin Liška
2022-05-18 1:50 ` Jakub Kicinski
2022-05-18 7:18 ` [PATCH v2] eth: sun: cassini: remove dead code Martin Liška
2022-05-18 13:10 ` patchwork-bot+netdevbpf
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).