diff options
| author | Simon Glass <sjg@chromium.org> | 2017-01-11 11:46:08 +0100 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2017-01-11 20:23:50 -0700 |
| commit | 0ea38db90caa55e8366c9bef4214ab52b3fedf6a (patch) | |
| tree | 3a7cf91ccdd1161736c53a095d05fee3bed0d747 /drivers/net | |
| parent | b9e08d0e80e311591704a49341199637069fd157 (diff) | |
net: designware: Adjust dw_adjust_link() to return an error
This function can fail, so return the error if there is one.
Signed-off-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Romain Perier <romain.perier@collabora.com>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/designware.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/drivers/net/designware.c b/drivers/net/designware.c index 6ef36bc8cb..ebcef8beaa 100644 --- a/drivers/net/designware.c +++ b/drivers/net/designware.c @@ -230,14 +230,14 @@ static int _dw_write_hwaddr(struct dw_eth_dev *priv, u8 *mac_id) return 0; } -static void dw_adjust_link(struct eth_mac_regs *mac_p, - struct phy_device *phydev) +static int dw_adjust_link(struct dw_eth_dev *priv, struct eth_mac_regs *mac_p, + struct phy_device *phydev) { u32 conf = readl(&mac_p->conf) | FRAMEBURSTENABLE | DISABLERXOWN; if (!phydev->link) { printf("%s: No link.\n", phydev->dev->name); - return; + return 0; } if (phydev->speed != 1000) @@ -256,6 +256,8 @@ static void dw_adjust_link(struct eth_mac_regs *mac_p, printf("Speed: %d, %s duplex%s\n", phydev->speed, (phydev->duplex) ? "full" : "half", (phydev->port == PORT_FIBRE) ? ", fiber mode" : ""); + + return 0; } static void _dw_eth_halt(struct dw_eth_dev *priv) @@ -321,7 +323,9 @@ static int _dw_eth_init(struct dw_eth_dev *priv, u8 *enetaddr) return ret; } - dw_adjust_link(mac_p, priv->phydev); + ret = dw_adjust_link(priv, mac_p, priv->phydev); + if (ret) + return ret; if (!priv->phydev->link) return -EIO; |