generic: add detach callback to struct phy_driver

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35510 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/target/linux/generic/patches-3.3/703-phy-add-detach-callback-to-struct-phy_driver.patch b/target/linux/generic/patches-3.3/703-phy-add-detach-callback-to-struct-phy_driver.patch
new file mode 100644 (file)
index 0000000..8af9a19
--- /dev/null
+++ b/target/linux/generic/patches-3.3/703-phy-add-detach-callback-to-struct-phy_driver.patch
@@ -0,0 +1,27 @@
+--- a/drivers/net/phy/phy_device.c
++++ b/drivers/net/phy/phy_device.c
+@@ -522,6 +522,9 @@ EXPORT_SYMBOL(phy_attach);
+  */
+ void phy_detach(struct phy_device *phydev)
+ {
++      if (phydev->drv && phydev->drv->detach)
++              phydev->drv->detach(phydev);
++
+       phydev->attached_dev->phydev = NULL;
+       phydev->attached_dev = NULL;
+ 
+--- a/include/linux/phy.h
++++ b/include/linux/phy.h
+@@ -417,6 +417,12 @@ struct phy_driver {
+        */
+       int (*did_interrupt)(struct phy_device *phydev);
+ 
++      /*
++       * Called before an ethernet device is detached
++       * from the PHY.
++       */
++      void (*detach)(struct phy_device *phydev);
++
+       /* Clears up any memory if needed */
+       void (*remove)(struct phy_device *phydev);
+ 

diff --git a/target/linux/generic/patches-3.3/710-phy-add-mdio_register_board_info.patch b/target/linux/generic/patches-3.3/710-phy-add-mdio_register_board_info.patch
index f4c00ca..5e40394 100644 (file)
--- a/target/linux/generic/patches-3.3/710-phy-add-mdio_register_board_info.patch
+++ b/target/linux/generic/patches-3.3/710-phy-add-mdio_register_board_info.patch
@@ -45,7 +45,7 @@
                phy_device_free(phydev);
 --- a/include/linux/phy.h
 +++ b/include/linux/phy.h
-@@ -543,4 +543,22 @@ int __init mdio_bus_init(void);
+@@ -549,4 +549,22 @@ int __init mdio_bus_init(void);
  void mdio_bus_exit(void);
  
  extern struct bus_type mdio_bus_type;

diff --git a/target/linux/generic/patches-3.6/703-phy-add-detach-callback-to-struct-phy_driver.patch b/target/linux/generic/patches-3.6/703-phy-add-detach-callback-to-struct-phy_driver.patch
new file mode 100644 (file)
index 0000000..b98f353
--- /dev/null
+++ b/target/linux/generic/patches-3.6/703-phy-add-detach-callback-to-struct-phy_driver.patch
@@ -0,0 +1,27 @@
+--- a/drivers/net/phy/phy_device.c
++++ b/drivers/net/phy/phy_device.c
+@@ -613,6 +613,9 @@ EXPORT_SYMBOL(phy_attach);
+  */
+ void phy_detach(struct phy_device *phydev)
+ {
++      if (phydev->drv && phydev->drv->detach)
++              phydev->drv->detach(phydev);
++
+       phydev->attached_dev->phydev = NULL;
+       phydev->attached_dev = NULL;
+ 
+--- a/include/linux/phy.h
++++ b/include/linux/phy.h
+@@ -432,6 +432,12 @@ struct phy_driver {
+        */
+       int (*did_interrupt)(struct phy_device *phydev);
+ 
++      /*
++       * Called before an ethernet device is detached
++       * from the PHY.
++       */
++      void (*detach)(struct phy_device *phydev);
++
+       /* Clears up any memory if needed */
+       void (*remove)(struct phy_device *phydev);
+ 

diff --git a/target/linux/generic/patches-3.6/710-phy-add-mdio_register_board_info.patch b/target/linux/generic/patches-3.6/710-phy-add-mdio_register_board_info.patch
index db64f5b..9ab58af 100644 (file)
--- a/target/linux/generic/patches-3.6/710-phy-add-mdio_register_board_info.patch
+++ b/target/linux/generic/patches-3.6/710-phy-add-mdio_register_board_info.patch
@@ -45,7 +45,7 @@
                phy_device_free(phydev);
 --- a/include/linux/phy.h
 +++ b/include/linux/phy.h
-@@ -575,4 +575,22 @@ int __init mdio_bus_init(void);
+@@ -581,4 +581,22 @@ int __init mdio_bus_init(void);
  void mdio_bus_exit(void);
  
  extern struct bus_type mdio_bus_type;

diff --git a/target/linux/generic/patches-3.7/703-phy-add-detach-callback-to-struct-phy_driver.patch b/target/linux/generic/patches-3.7/703-phy-add-detach-callback-to-struct-phy_driver.patch
new file mode 100644 (file)
index 0000000..b98f353
--- /dev/null
+++ b/target/linux/generic/patches-3.7/703-phy-add-detach-callback-to-struct-phy_driver.patch
@@ -0,0 +1,27 @@
+--- a/drivers/net/phy/phy_device.c
++++ b/drivers/net/phy/phy_device.c
+@@ -613,6 +613,9 @@ EXPORT_SYMBOL(phy_attach);
+  */
+ void phy_detach(struct phy_device *phydev)
+ {
++      if (phydev->drv && phydev->drv->detach)
++              phydev->drv->detach(phydev);
++
+       phydev->attached_dev->phydev = NULL;
+       phydev->attached_dev = NULL;
+ 
+--- a/include/linux/phy.h
++++ b/include/linux/phy.h
+@@ -432,6 +432,12 @@ struct phy_driver {
+        */
+       int (*did_interrupt)(struct phy_device *phydev);
+ 
++      /*
++       * Called before an ethernet device is detached
++       * from the PHY.
++       */
++      void (*detach)(struct phy_device *phydev);
++
+       /* Clears up any memory if needed */
+       void (*remove)(struct phy_device *phydev);
+ 

diff --git a/target/linux/generic/patches-3.7/710-phy-add-mdio_register_board_info.patch b/target/linux/generic/patches-3.7/710-phy-add-mdio_register_board_info.patch
index a1c5b1d..9a68fea 100644 (file)
--- a/target/linux/generic/patches-3.7/710-phy-add-mdio_register_board_info.patch
+++ b/target/linux/generic/patches-3.7/710-phy-add-mdio_register_board_info.patch
@@ -45,7 +45,7 @@
                phy_device_free(phydev);
 --- a/include/linux/phy.h
 +++ b/include/linux/phy.h
-@@ -575,4 +575,22 @@ int __init mdio_bus_init(void);
+@@ -581,4 +581,22 @@ int __init mdio_bus_init(void);
  void mdio_bus_exit(void);
  
  extern struct bus_type mdio_bus_type;

diff --git a/target/linux/generic/patches-3.8/703-phy-add-detach-callback-to-struct-phy_driver.patch b/target/linux/generic/patches-3.8/703-phy-add-detach-callback-to-struct-phy_driver.patch
new file mode 100644 (file)
index 0000000..b98f353
--- /dev/null
+++ b/target/linux/generic/patches-3.8/703-phy-add-detach-callback-to-struct-phy_driver.patch
@@ -0,0 +1,27 @@
+--- a/drivers/net/phy/phy_device.c
++++ b/drivers/net/phy/phy_device.c
+@@ -613,6 +613,9 @@ EXPORT_SYMBOL(phy_attach);
+  */
+ void phy_detach(struct phy_device *phydev)
+ {
++      if (phydev->drv && phydev->drv->detach)
++              phydev->drv->detach(phydev);
++
+       phydev->attached_dev->phydev = NULL;
+       phydev->attached_dev = NULL;
+ 
+--- a/include/linux/phy.h
++++ b/include/linux/phy.h
+@@ -432,6 +432,12 @@ struct phy_driver {
+        */
+       int (*did_interrupt)(struct phy_device *phydev);
+ 
++      /*
++       * Called before an ethernet device is detached
++       * from the PHY.
++       */
++      void (*detach)(struct phy_device *phydev);
++
+       /* Clears up any memory if needed */
+       void (*remove)(struct phy_device *phydev);
+ 

diff --git a/target/linux/generic/patches-3.8/710-phy-add-mdio_register_board_info.patch b/target/linux/generic/patches-3.8/710-phy-add-mdio_register_board_info.patch
index a1c5b1d..9a68fea 100644 (file)
--- a/target/linux/generic/patches-3.8/710-phy-add-mdio_register_board_info.patch
+++ b/target/linux/generic/patches-3.8/710-phy-add-mdio_register_board_info.patch
@@ -45,7 +45,7 @@
                phy_device_free(phydev);
 --- a/include/linux/phy.h
 +++ b/include/linux/phy.h
-@@ -575,4 +575,22 @@ int __init mdio_bus_init(void);
+@@ -581,4 +581,22 @@ int __init mdio_bus_init(void);
  void mdio_bus_exit(void);
  
  extern struct bus_type mdio_bus_type;