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

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@18252 3c298f89-4303-0410-b956-a3cf2f4a3e73

4 files changed, 26 insertions, 28 deletions

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
index 6663733db..000000000
--- 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 d96265812..53fa05e1b 100644
--- 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
index b77dc0633..000000000
--- 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 857d959a4..b9835a012 100644
--- 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);