lkml.org 
[lkml]   [2022]   [Aug]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.15 002/136] eth: sun: cassini: remove dead code
    Date
    From: Martin Liška <mliska@suse.cz>

    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>
    Cc: "Sudip Mukherjee (Codethink)" <sudipm.mukherjee@gmail.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/net/ethernet/sun/cassini.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    --- a/drivers/net/ethernet/sun/cassini.c
    +++ b/drivers/net/ethernet/sun/cassini.c
    @@ -1325,7 +1325,7 @@ static void cas_init_rx_dma(struct cas *
    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);
    @@ -3794,7 +3794,7 @@ static void cas_reset(struct cas *cp, in

    /* 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);

    \
     
     \ /
      Last update: 2022-08-29 13:06    [W:2.977 / U:0.032 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site