net: dsa: mv88e6xxx: create serdes_get_lane chip operation

[linux.git] / drivers / net / dsa / mv88e6xxx / port.c

diff --git a/drivers/net/dsa/mv88e6xxx/port.c b/drivers/net/dsa/mv88e6xxx/port.c
index c95cdb73e5a2d0993a07179ac9687da97b4dd5fd..4b0c58c30fea5bc1c2d9ce67d8b95d5b9a980b33 100644 (file)
--- a/drivers/net/dsa/mv88e6xxx/port.c
+++ b/drivers/net/dsa/mv88e6xxx/port.c
@@ -395,7 +395,7 @@ phy_interface_t mv88e6390x_port_max_speed_mode(int port)
 int mv88e6390x_port_set_cmode(struct mv88e6xxx_chip *chip, int port,
                              phy_interface_t mode)
 {
-       int lane;
+       u8 lane;
        u16 cmode;
        u16 reg;
        int err;
@@ -434,11 +434,11 @@ int mv88e6390x_port_set_cmode(struct mv88e6xxx_chip *chip, int port,
        if (cmode == chip->ports[port].cmode)
                return 0;
 
-       lane = mv88e6390x_serdes_get_lane(chip, port);
-       if (lane < 0 && lane != -ENODEV)
-               return lane;
+       err = mv88e6xxx_serdes_get_lane(chip, port, &lane);
+       if (err && err != -ENODEV)
+               return err;
 
-       if (lane >= 0) {
+       if (err != -ENODEV) {
                if (chip->ports[port].serdes_irq) {
                        err = mv88e6390_serdes_irq_disable(chip, port, lane);
                        if (err)
@@ -466,9 +466,9 @@ int mv88e6390x_port_set_cmode(struct mv88e6xxx_chip *chip, int port,
 
                chip->ports[port].cmode = cmode;
 
-               lane = mv88e6390x_serdes_get_lane(chip, port);
-               if (lane < 0)
-                       return lane;
+               err = mv88e6xxx_serdes_get_lane(chip, port, &lane);
+               if (err)
+                       return err;
 
                err = mv88e6390x_serdes_power(chip, port, true);
                if (err)