ixp4xx: the missing phy_disconnect call has been added in upstream, remove that patch

SVN-Revision: 18252

diff --git a/target/linux/ixp4xx/patches-2.6.30/204-npe_driver_add_missing_phy_disconnect.patch b/target/linux/ixp4xx/patches-2.6.30/204-npe_driver_add_missing_phy_disconnect.patch
deleted file mode 100644 (file)
index 6663733..0000000
--- a/target/linux/ixp4xx/patches-2.6.30/204-npe_driver_add_missing_phy_disconnect.patch
+++ /dev/null
@@ -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;

diff --git a/target/linux/ixp4xx/patches-2.6.30/205-npe_driver_separate_phy_functions.patch b/target/linux/ixp4xx/patches-2.6.30/205-npe_driver_separate_phy_functions.patch
index d962658122aa64df51ed60f739569da111d0bcdb..53fa05e1b95df0b04bf22c6dd18e761af086d273 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.30/205-npe_driver_separate_phy_functions.patch
+++ b/target/linux/ixp4xx/patches-2.6.30/205-npe_driver_separate_phy_functions.patch
@@ -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);
+ 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);
+-      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);

diff --git a/target/linux/ixp4xx/patches-2.6.31/204-npe_driver_add_missing_phy_disconnect.patch b/target/linux/ixp4xx/patches-2.6.31/204-npe_driver_add_missing_phy_disconnect.patch
deleted file mode 100644 (file)
index b77dc06..0000000
--- a/target/linux/ixp4xx/patches-2.6.31/204-npe_driver_add_missing_phy_disconnect.patch
+++ /dev/null
@@ -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;

diff --git a/target/linux/ixp4xx/patches-2.6.31/205-npe_driver_separate_phy_functions.patch b/target/linux/ixp4xx/patches-2.6.31/205-npe_driver_separate_phy_functions.patch
index 857d959a4ef00b7adaa71fdb63bea9e63dbc0d15..b9835a012b1277e252c2cc5edc6a27b807c8b07d 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.31/205-npe_driver_separate_phy_functions.patch
+++ b/target/linux/ixp4xx/patches-2.6.31/205-npe_driver_separate_phy_functions.patch
@@ -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);