summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Liška <mliska@suse.cz>2022-05-18 09:18:53 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2023-06-09 10:22:53 +0200
commitb1bea83acc3dd22f7d4d9c324f8d6c2617bea8be (patch)
treeee5d4eb9e1555d17c16853d567617ae71b7935a4
parentb03ff104cdc7916a4a8ea8300fd4c506cac2dce5 (diff)
downloadlinux-b1bea83acc3dd22f7d4d9c324f8d6c2617bea8be.tar.gz
linux-b1bea83acc3dd22f7d4d9c324f8d6c2617bea8be.tar.bz2
linux-b1bea83acc3dd22f7d4d9c324f8d6c2617bea8be.zip
eth: sun: cassini: remove dead code
commit 32329216ca1d6ee29c41215f18b3053bb6158541 upstream. 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> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/net/ethernet/sun/cassini.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/sun/cassini.c b/drivers/net/ethernet/sun/cassini.c
index ba546f993fb5..0d26e8047d70 100644
--- a/drivers/net/ethernet/sun/cassini.c
+++ b/drivers/net/ethernet/sun/cassini.c
@@ -1349,7 +1349,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);
@@ -3819,7 +3819,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);