Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d2b6d2ee authored by Martin Liška's avatar Martin Liška Committed by Greg Kroah-Hartman
Browse files

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: default avatarMartin Liska <mliska@suse.cz>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 89cb216f

drivers/net/ethernet/sun/cassini.c

+2 −2
Original line number Diff line number Diff line
@@ -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);