Commit b7035860 authored by Johan Hovold's avatar Johan Hovold Committed by David S. Miller

net: phy: micrel: refactor led-mode error handling

Refactor led-mode error handling.
Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8620546c
...@@ -179,14 +179,19 @@ static int kszphy_setup_led(struct phy_device *phydev, ...@@ -179,14 +179,19 @@ static int kszphy_setup_led(struct phy_device *phydev,
} }
temp = phy_read(phydev, reg); temp = phy_read(phydev, reg);
if (temp < 0) if (temp < 0) {
return temp; rc = temp;
goto out;
}
temp &= ~(3 << shift); temp &= ~(3 << shift);
temp |= val << shift; temp |= val << shift;
rc = phy_write(phydev, reg, temp); rc = phy_write(phydev, reg, temp);
out:
if (rc < 0)
dev_err(&phydev->dev, "failed to set led mode\n");
return rc < 0 ? rc : 0; return rc;
} }
/* Disable PHY address 0 as the broadcast address, so that it can be used as a /* Disable PHY address 0 as the broadcast address, so that it can be used as a
...@@ -223,9 +228,7 @@ static int ksz8021_config_init(struct phy_device *phydev) ...@@ -223,9 +228,7 @@ static int ksz8021_config_init(struct phy_device *phydev)
{ {
int rc; int rc;
rc = kszphy_setup_led(phydev, 0x1f, 4); kszphy_setup_led(phydev, 0x1f, 4);
if (rc)
dev_err(&phydev->dev, "failed to set led mode\n");
rc = ksz_config_flags(phydev); rc = ksz_config_flags(phydev);
if (rc < 0) if (rc < 0)
...@@ -240,9 +243,7 @@ static int ks8051_config_init(struct phy_device *phydev) ...@@ -240,9 +243,7 @@ static int ks8051_config_init(struct phy_device *phydev)
{ {
int rc; int rc;
rc = kszphy_setup_led(phydev, 0x1f, 4); kszphy_setup_led(phydev, 0x1f, 4);
if (rc)
dev_err(&phydev->dev, "failed to set led mode\n");
rc = ksz_config_flags(phydev); rc = ksz_config_flags(phydev);
return rc < 0 ? rc : 0; return rc < 0 ? rc : 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment