lkml.org 
[lkml]   [2022]   [Nov]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v1 19/26] net: dsa: microchip: ksz8_r_dyn_mac_table(): use entries variable to signal 0 entries
    Date
    We already have a variable to provide number of entries. So use it,
    instead of using error number.

    Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>
    ---
    drivers/net/dsa/microchip/ksz8795.c | 24 +++++++-----------------
    1 file changed, 7 insertions(+), 17 deletions(-)

    diff --git a/drivers/net/dsa/microchip/ksz8795.c b/drivers/net/dsa/microchip/ksz8795.c
    index 3348f5c25942..31c77e086a9d 100644
    --- a/drivers/net/dsa/microchip/ksz8795.c
    +++ b/drivers/net/dsa/microchip/ksz8795.c
    @@ -385,19 +385,11 @@ static int ksz8_valid_dyn_entry(struct ksz_device *dev, u8 *data)
    } while ((*data & masks[DYNAMIC_MAC_TABLE_NOT_READY]) && timeout);

    /* Entry is not ready for accessing. */
    - if (*data & masks[DYNAMIC_MAC_TABLE_NOT_READY]) {
    + if (*data & masks[DYNAMIC_MAC_TABLE_NOT_READY])
    return -ETIMEDOUT;
    - /* Entry is ready for accessing. */
    - } else {
    - ret = ksz_read8(dev, regs[REG_IND_DATA_8], data);
    - if (ret)
    - return ret;

    - /* There is no valid entry in the table. */
    - if (*data & masks[DYNAMIC_MAC_TABLE_MAC_EMPTY])
    - return -ENXIO;
    - }
    - return 0;
    + /* Entry is ready for accessing. */
    + return ksz_read8(dev, regs[REG_IND_DATA_8], data);
    }

    static int ksz8_r_dyn_mac_table(struct ksz_device *dev, u16 addr, u8 *mac_addr,
    @@ -425,13 +417,13 @@ static int ksz8_r_dyn_mac_table(struct ksz_device *dev, u16 addr, u8 *mac_addr,
    goto unlock_alu;

    ret = ksz8_valid_dyn_entry(dev, &data);
    - if (ret == -ENXIO) {
    - *entries = 0;
    + if (ret)
    goto unlock_alu;
    - }

    - if (ret)
    + if (data & masks[DYNAMIC_MAC_TABLE_MAC_EMPTY]) {
    + *entries = 0;
    goto unlock_alu;
    + }

    ret = ksz_read64(dev, regs[REG_IND_DATA_HI], &buf);
    if (ret)
    @@ -997,8 +989,6 @@ int ksz8_fdb_dump(struct ksz_device *dev, int port,
    u8 src_port;

    ret = ksz8_r_dyn_mac_table(dev, i, mac, &src_port, &entries);
    - if (ret == -ENXIO)
    - return 0;
    if (ret)
    return ret;

    --
    2.30.2
    \
     
     \ /
      Last update: 2022-11-28 13:05    [W:6.792 / U:0.040 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site