generic: add detach callback to struct phy_driver

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 35510
master
Gabor Juhos 12 years ago
parent 07db9e8eab
commit fe61fc2d7d
  1. 27
      target/linux/generic/patches-3.3/703-phy-add-detach-callback-to-struct-phy_driver.patch
  2. 2
      target/linux/generic/patches-3.3/710-phy-add-mdio_register_board_info.patch
  3. 27
      target/linux/generic/patches-3.6/703-phy-add-detach-callback-to-struct-phy_driver.patch
  4. 2
      target/linux/generic/patches-3.6/710-phy-add-mdio_register_board_info.patch
  5. 27
      target/linux/generic/patches-3.7/703-phy-add-detach-callback-to-struct-phy_driver.patch
  6. 2
      target/linux/generic/patches-3.7/710-phy-add-mdio_register_board_info.patch
  7. 27
      target/linux/generic/patches-3.8/703-phy-add-detach-callback-to-struct-phy_driver.patch
  8. 2
      target/linux/generic/patches-3.8/710-phy-add-mdio_register_board_info.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);

@ -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;

@ -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);

@ -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;

@ -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);

@ -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;

@ -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);

@ -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;

Loading…
Cancel
Save