ixp4xx: the missing phy_disconnect call has been added in upstream, remove that patch
SVN-Revision: 18252
This commit is contained in:
parent
5f4c7746cd
commit
9be77f8669
4 changed files with 27 additions and 29 deletions
|
@ -1,10 +0,0 @@
|
|||
--- a/drivers/net/arm/ixp4xx_eth.c
|
||||
+++ b/drivers/net/arm/ixp4xx_eth.c
|
||||
@@ -1247,6 +1247,7 @@ static int __devexit eth_remove_one(stru
|
||||
struct net_device *dev = platform_get_drvdata(pdev);
|
||||
struct port *port = netdev_priv(dev);
|
||||
|
||||
+ phy_disconnect(port->phydev);
|
||||
unregister_netdev(dev);
|
||||
phy_disconnect(port->phydev);
|
||||
npe_port_tab[NPE_ID(port->id)] = NULL;
|
|
@ -99,12 +99,21 @@
|
|||
if ((err = register_netdev(dev)))
|
||||
goto err_phy_dis;
|
||||
|
||||
@@ -1247,7 +1281,7 @@ static int __devexit eth_remove_one(stru
|
||||
struct net_device *dev = platform_get_drvdata(pdev);
|
||||
struct port *port = netdev_priv(dev);
|
||||
@@ -1230,7 +1264,7 @@ static int __devinit eth_init_one(struct
|
||||
return 0;
|
||||
|
||||
err_phy_dis:
|
||||
- phy_disconnect(port->phydev);
|
||||
+ ixp4xx_phy_disconnect(dev);
|
||||
unregister_netdev(dev);
|
||||
phy_disconnect(port->phydev);
|
||||
err_free_mem:
|
||||
npe_port_tab[NPE_ID(port->id)] = NULL;
|
||||
platform_set_drvdata(pdev, NULL);
|
||||
@@ -1248,7 +1282,7 @@ static int __devexit eth_remove_one(stru
|
||||
struct port *port = netdev_priv(dev);
|
||||
|
||||
unregister_netdev(dev);
|
||||
- phy_disconnect(port->phydev);
|
||||
+ ixp4xx_phy_disconnect(dev);
|
||||
npe_port_tab[NPE_ID(port->id)] = NULL;
|
||||
platform_set_drvdata(pdev, NULL);
|
||||
npe_release(port->npe);
|
||||
|
|
|
@ -1,10 +0,0 @@
|
|||
--- a/drivers/net/arm/ixp4xx_eth.c
|
||||
+++ b/drivers/net/arm/ixp4xx_eth.c
|
||||
@@ -1249,6 +1249,7 @@ static int __devexit eth_remove_one(stru
|
||||
struct net_device *dev = platform_get_drvdata(pdev);
|
||||
struct port *port = netdev_priv(dev);
|
||||
|
||||
+ phy_disconnect(port->phydev);
|
||||
unregister_netdev(dev);
|
||||
phy_disconnect(port->phydev);
|
||||
npe_port_tab[NPE_ID(port->id)] = NULL;
|
|
@ -99,12 +99,21 @@
|
|||
if ((err = register_netdev(dev)))
|
||||
goto err_phy_dis;
|
||||
|
||||
@@ -1249,7 +1283,7 @@ static int __devexit eth_remove_one(stru
|
||||
struct net_device *dev = platform_get_drvdata(pdev);
|
||||
@@ -1232,7 +1266,7 @@ static int __devinit eth_init_one(struct
|
||||
return 0;
|
||||
|
||||
err_phy_dis:
|
||||
- phy_disconnect(port->phydev);
|
||||
+ ixp4xx_phy_disconnect(port->phydev);
|
||||
err_free_mem:
|
||||
npe_port_tab[NPE_ID(port->id)] = NULL;
|
||||
platform_set_drvdata(pdev, NULL);
|
||||
@@ -1250,7 +1284,7 @@ static int __devexit eth_remove_one(stru
|
||||
struct port *port = netdev_priv(dev);
|
||||
|
||||
unregister_netdev(dev);
|
||||
- phy_disconnect(port->phydev);
|
||||
+ ixp4xx_phy_disconnect(dev);
|
||||
unregister_netdev(dev);
|
||||
phy_disconnect(port->phydev);
|
||||
npe_port_tab[NPE_ID(port->id)] = NULL;
|
||||
platform_set_drvdata(pdev, NULL);
|
||||
npe_release(port->npe);
|
||||
|
|
Loading…
Reference in a new issue