lkml.org 
[lkml]   [2021]   [Dec]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v3] net: dsa: mv88e6xxx: error handling for serdes_power functions
    Date
    Added default case to handle undefined cmode scenario in
    mv88e6393x_serdes_power() and mv88e6393x_serdes_power() methods.

    Signed-off-by: Ameer Hamza <amhamza.mgc@gmail.com>
    ---
    Changes in v3:
    make err = -EINVAL instead of direct return, so that we can
    check in the code after and handle the error case.
    ---
    drivers/net/dsa/mv88e6xxx/serdes.c | 10 ++++++++--
    1 file changed, 8 insertions(+), 2 deletions(-)

    diff --git a/drivers/net/dsa/mv88e6xxx/serdes.c b/drivers/net/dsa/mv88e6xxx/serdes.c
    index 33727439724a..2b05ead515cd 100644
    --- a/drivers/net/dsa/mv88e6xxx/serdes.c
    +++ b/drivers/net/dsa/mv88e6xxx/serdes.c
    @@ -830,7 +830,7 @@ int mv88e6390_serdes_power(struct mv88e6xxx_chip *chip, int port, int lane,
    bool up)
    {
    u8 cmode = chip->ports[port].cmode;
    - int err = 0;
    + int err;

    switch (cmode) {
    case MV88E6XXX_PORT_STS_CMODE_SGMII:
    @@ -842,6 +842,9 @@ int mv88e6390_serdes_power(struct mv88e6xxx_chip *chip, int port, int lane,
    case MV88E6XXX_PORT_STS_CMODE_RXAUI:
    err = mv88e6390_serdes_power_10g(chip, lane, up);
    break;
    + default:
    + err = -EINVAL;
    + break;
    }

    if (!err && up)
    @@ -1507,7 +1510,7 @@ int mv88e6393x_serdes_power(struct mv88e6xxx_chip *chip, int port, int lane,
    bool on)
    {
    u8 cmode = chip->ports[port].cmode;
    - int err = 0;
    + int err;

    if (port != 0 && port != 9 && port != 10)
    return -EOPNOTSUPP;
    @@ -1541,6 +1544,9 @@ int mv88e6393x_serdes_power(struct mv88e6xxx_chip *chip, int port, int lane,
    case MV88E6393X_PORT_STS_CMODE_10GBASER:
    err = mv88e6390_serdes_power_10g(chip, lane, on);
    break;
    + default:
    + err = -EINVAL;
    + break;
    }

    if (err)
    --
    2.25.1
    \
     
     \ /
      Last update: 2021-12-08 16:59    [W:4.941 / U:0.192 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site