]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
eth: sun: cassini: remove dead code
authorMartin Liška <mliska@suse.cz>
Wed, 18 May 2022 07:18:53 +0000 (09:18 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 9 Jun 2023 08:24:02 +0000 (10:24 +0200)
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>
drivers/net/ethernet/sun/cassini.c

index a3a5edb8bc666576853d5687a63dcaeb68a663f0..909f6d1605f7a4a7d48e65c200d155a2d4921010 100644 (file)
@@ -1337,7 +1337,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);
@@ -3807,7 +3807,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);