Commit 1358bd5a authored by Jeremy Linton's avatar Jeremy Linton Committed by David S. Miller

net: smsc911x: Remove multiple exit points from smsc911x_open

Rework the error handling in smsc911x open in preparation
for the mdio startup being moved here.
Signed-off-by: default avatarJeremy Linton <jeremy.linton@arm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2f86953e
...@@ -1520,17 +1520,20 @@ static int smsc911x_open(struct net_device *dev) ...@@ -1520,17 +1520,20 @@ static int smsc911x_open(struct net_device *dev)
unsigned int timeout; unsigned int timeout;
unsigned int temp; unsigned int temp;
unsigned int intcfg; unsigned int intcfg;
int retval;
/* if the phy is not yet registered, retry later*/ /* if the phy is not yet registered, retry later*/
if (!dev->phydev) { if (!dev->phydev) {
SMSC_WARN(pdata, hw, "phy_dev is NULL"); SMSC_WARN(pdata, hw, "phy_dev is NULL");
return -EAGAIN; retval = -EAGAIN;
goto out;
} }
/* Reset the LAN911x */ /* Reset the LAN911x */
if (smsc911x_soft_reset(pdata)) { retval = smsc911x_soft_reset(pdata);
if (retval) {
SMSC_WARN(pdata, hw, "soft reset failed"); SMSC_WARN(pdata, hw, "soft reset failed");
return -EIO; goto out;
} }
smsc911x_reg_write(pdata, HW_CFG, 0x00050000); smsc911x_reg_write(pdata, HW_CFG, 0x00050000);
...@@ -1600,7 +1603,8 @@ static int smsc911x_open(struct net_device *dev) ...@@ -1600,7 +1603,8 @@ static int smsc911x_open(struct net_device *dev)
if (!pdata->software_irq_signal) { if (!pdata->software_irq_signal) {
netdev_warn(dev, "ISR failed signaling test (IRQ %d)\n", netdev_warn(dev, "ISR failed signaling test (IRQ %d)\n",
dev->irq); dev->irq);
return -ENODEV; retval = -ENODEV;
goto out;
} }
SMSC_TRACE(pdata, ifup, "IRQ handler passed test using IRQ %d", SMSC_TRACE(pdata, ifup, "IRQ handler passed test using IRQ %d",
dev->irq); dev->irq);
...@@ -1646,6 +1650,8 @@ static int smsc911x_open(struct net_device *dev) ...@@ -1646,6 +1650,8 @@ static int smsc911x_open(struct net_device *dev)
netif_start_queue(dev); netif_start_queue(dev);
return 0; return 0;
out:
return retval;
} }
/* Entry point for stopping the interface */ /* Entry point for stopping the interface */
......
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