generic: add detach callback to struct phy_driver
Signed-off-by: Gabor Juhos <juhosg@openwrt.org> SVN-Revision: 35510
This commit is contained in:
parent
07db9e8eab
commit
fe61fc2d7d
8 changed files with 112 additions and 4 deletions
|
@ -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…
Reference in a new issue