From dcf08a73d4635ca582b308a2a0b23586e2939f2b Mon Sep 17 00:00:00 2001 From: Anton Vorontsov Date: Mon, 18 Jan 2010 05:37:16 +0000 Subject: [PATCH] --- yaml --- r: 179787 b: refs/heads/master c: 4f9c85a1b03bfa5c0a0d8488a3a7766f3c9fb756 h: refs/heads/master i: 179785: 9247cfd76d1e6fa5fef5fcc1bf9f6e55cabfd1df 179783: 84d0c2ac43d5bb3aff6cda8f820dc2c33e057aee v: v3 --- [refs] | 2 +- trunk/drivers/net/phy/phy.c | 4 +--- trunk/drivers/net/phy/phy_device.c | 1 + trunk/include/linux/phy.h | 1 + 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index c7b992fc4429..91a1f40ef185 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: de4ef86cfce60d2250111f34f8a084e769f23b16 +refs/heads/master: 4f9c85a1b03bfa5c0a0d8488a3a7766f3c9fb756 diff --git a/trunk/drivers/net/phy/phy.c b/trunk/drivers/net/phy/phy.c index b0e9f9c51721..0295097d6c44 100644 --- a/trunk/drivers/net/phy/phy.c +++ b/trunk/drivers/net/phy/phy.c @@ -410,7 +410,6 @@ EXPORT_SYMBOL(phy_start_aneg); static void phy_change(struct work_struct *work); -static void phy_state_machine(struct work_struct *work); /** * phy_start_machine - start PHY state machine tracking @@ -430,7 +429,6 @@ void phy_start_machine(struct phy_device *phydev, { phydev->adjust_state = handler; - INIT_DELAYED_WORK(&phydev->state_queue, phy_state_machine); schedule_delayed_work(&phydev->state_queue, HZ); } @@ -761,7 +759,7 @@ EXPORT_SYMBOL(phy_start); * phy_state_machine - Handle the state machine * @work: work_struct that describes the work to be done */ -static void phy_state_machine(struct work_struct *work) +void phy_state_machine(struct work_struct *work) { struct delayed_work *dwork = to_delayed_work(work); struct phy_device *phydev = diff --git a/trunk/drivers/net/phy/phy_device.c b/trunk/drivers/net/phy/phy_device.c index 8212b2b93422..adbc0fded130 100644 --- a/trunk/drivers/net/phy/phy_device.c +++ b/trunk/drivers/net/phy/phy_device.c @@ -177,6 +177,7 @@ struct phy_device* phy_device_create(struct mii_bus *bus, int addr, int phy_id) dev->state = PHY_DOWN; mutex_init(&dev->lock); + INIT_DELAYED_WORK(&dev->state_queue, phy_state_machine); return dev; } diff --git a/trunk/include/linux/phy.h b/trunk/include/linux/phy.h index 7968defd2fa7..6a7eb402165d 100644 --- a/trunk/include/linux/phy.h +++ b/trunk/include/linux/phy.h @@ -485,6 +485,7 @@ void phy_driver_unregister(struct phy_driver *drv); int phy_driver_register(struct phy_driver *new_driver); void phy_prepare_link(struct phy_device *phydev, void (*adjust_link)(struct net_device *)); +void phy_state_machine(struct work_struct *work); void phy_start_machine(struct phy_device *phydev, void (*handler)(struct net_device *)); void phy_stop_machine(struct phy_device *phydev);