KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ar71xx: move phy_connect call to ag71xx_open

Browse source 
SVN-Revision: 18691
This commit is contained in:
Gabor Juhos 2009-12-08 10:29:19 +00:00
parent 6a4814517f
commit 0e79007faf
1 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c
View file

@ -435,12 +435,16 @@ static void ag71xx_hw_stop(struct ag71xx *ag)
static int ag71xx_open(struct net_device *dev) static int ag71xx_open(struct net_device *dev)
{ {
struct ag71xx *ag = netdev_priv(dev); struct ag71xx *ag = netdev_priv(dev);
int ret; int err;
ret = ag71xx_rings_init(ag); err = ag71xx_phy_connect(ag);
if (ret) if (err)
goto err; goto err;
err = ag71xx_rings_init(ag);
if (err)
goto err_ring_cleanup;
napi_enable(&ag->napi); napi_enable(&ag->napi);
netif_carrier_off(dev); netif_carrier_off(dev);
@ -457,9 +461,10 @@ static int ag71xx_open(struct net_device *dev)
return 0; return 0;
err: err_ring_cleanup:
ag71xx_rings_cleanup(ag); ag71xx_rings_cleanup(ag);
return ret; err:
return err;
} }
static int ag71xx_stop(struct net_device *dev) static int ag71xx_stop(struct net_device *dev)
@ -482,6 +487,7 @@ static int ag71xx_stop(struct net_device *dev)
spin_unlock_irqrestore(&ag->lock, flags); spin_unlock_irqrestore(&ag->lock, flags);
ag71xx_rings_cleanup(ag); ag71xx_rings_cleanup(ag);
ag71xx_phy_disconnect(ag);
return 0; return 0;
} }
@ -913,16 +919,10 @@ static int __init ag71xx_probe(struct platform_device *pdev)
mutex_unlock(&ag->mii_bus->mdio_lock); mutex_unlock(&ag->mii_bus->mdio_lock);
} }
err = ag71xx_phy_connect(ag);
if (err)
goto err_unregister_netdev;
platform_set_drvdata(pdev, dev); platform_set_drvdata(pdev, dev);
return 0; return 0;
err_unregister_netdev:
unregister_netdev(dev);
err_free_irq: err_free_irq:
free_irq(dev->irq, dev); free_irq(dev->irq, dev);
err_unmap_mii_ctrl: err_unmap_mii_ctrl:
@ -943,7 +943,6 @@ static int __exit ag71xx_remove(struct platform_device *pdev)
if (dev) { if (dev) {
struct ag71xx *ag = netdev_priv(dev); struct ag71xx *ag = netdev_priv(dev);
ag71xx_phy_disconnect(ag);
unregister_netdev(dev); unregister_netdev(dev);
free_irq(dev->irq, dev); free_irq(dev->irq, dev);
iounmap(ag->mii_ctrl); iounmap(ag->mii_ctrl);