@@ -565,24 +565,6 @@ void phy_trigger_machine(struct phy_device *phydev, bool sync)
queue_delayed_work(system_power_efficient_wq, &phydev->state_queue, 0);
}
-/**
- * phy_stop_machine - stop the PHY state machine tracking
- * @phydev: target phy_device struct
- *
- * Description: Stops the state machine delayed workqueue, sets the
- * state to UP (unless it wasn't up yet). This function must be
- * called BEFORE phy_detach.
- */
-void phy_stop_machine(struct phy_device *phydev)
-{
- cancel_delayed_work_sync(&phydev->state_queue);
-
- mutex_lock(&phydev->lock);
- if (phydev->state > PHY_UP && phydev->state != PHY_HALTED)
- phydev->state = PHY_UP;
- mutex_unlock(&phydev->lock);
-}
-
/**
* phy_error - enter HALTED state for this PHY device
* @phydev: target phy_device struct
@@ -831,8 +831,6 @@ void phy_disconnect(struct phy_device *phydev)
if (phydev->irq > 0)
phy_stop_interrupts(phydev);
- phy_stop_machine(phydev);
-
phydev->adjust_link = NULL;
phy_detach(phydev);
@@ -1023,7 +1023,6 @@ int phy_drivers_register(struct phy_driver *new_driver, int n,
void phy_state_machine(struct work_struct *work);
void phy_change_work(struct work_struct *work);
void phy_mac_interrupt(struct phy_device *phydev);
-void phy_stop_machine(struct phy_device *phydev);
void phy_trigger_machine(struct phy_device *phydev, bool sync);
int phy_ethtool_sset(struct phy_device *phydev, struct ethtool_cmd *cmd);
void phy_ethtool_ksettings_get(struct phy_device *phydev,
Now that the functionality of phy_stop() was integrated to __phy_stop() we can remove phy_stop_machine(). Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> --- v2: - no changes --- drivers/net/phy/phy.c | 18 ------------------ drivers/net/phy/phy_device.c | 2 -- include/linux/phy.h | 1 - 3 files changed, 21 deletions(-)