mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-12 21:57:43 +00:00
Code Issues Releases Wiki Activity

net: smsc911x: Remove multiple exit points from smsc911x_open

Browse source 
Rework the error handling in smsc911x open in preparation
for the mdio startup being moved here.

Signed-off-by: Jeremy Linton <jeremy.linton@arm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Jeremy Linton 2016-09-01 15:15:06 -05:00 committed by David S. Miller
parent 2f86953e74
commit 1358bd5a74
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
drivers/net/ethernet/smsc/smsc911x.c
View file

@ -1520,17 +1520,20 @@ static int smsc911x_open(struct net_device *dev)
unsigned int timeout;
unsigned int temp;
unsigned int intcfg;
int retval;
/* if the phy is not yet registered, retry later*/
if (!dev->phydev) {
SMSC_WARN(pdata, hw, "phy_dev is NULL");
return -EAGAIN;
retval = -EAGAIN;
goto out;
}
/* Reset the LAN911x */
if (smsc911x_soft_reset(pdata)) {
retval = smsc911x_soft_reset(pdata);
if (retval) {
SMSC_WARN(pdata, hw, "soft reset failed");
return -EIO;
goto out;
}
smsc911x_reg_write(pdata, HW_CFG, 0x00050000);
@ -1600,7 +1603,8 @@ static int smsc911x_open(struct net_device *dev)
if (!pdata->software_irq_signal) {
netdev_warn(dev, "ISR failed signaling test (IRQ %d)\n",
dev->irq);
return -ENODEV;
retval = -ENODEV;
goto out;
}
SMSC_TRACE(pdata, ifup, "IRQ handler passed test using IRQ %d",
dev->irq);
@ -1646,6 +1650,8 @@ static int smsc911x_open(struct net_device *dev)
netif_start_queue(dev);
return 0;
out:
return retval;
}
/* Entry point for stopping the interface */