After having made PHY_HALTED a transition state to PHY_READY and having
removed direct use of PHY_CHANGELINK in drivers we can remove states
PHY_RESUMING and PHY_CHANGELINK.
Signed-off-by: Heiner Kallweit <hkallwe...@gmail.com>
---
drivers/net/phy/phy.c | 4 ----
include/linux/phy.h | 12 ------------
2 files changed, 16 deletions(-)
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index 2a69d947e..b34158420 100644
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -52,8 +52,6 @@ static const char *phy_state_to_str(enum phy_state st)
PHY_STATE_STR(RUNNING)
PHY_STATE_STR(NOLINK)
PHY_STATE_STR(FORCING)
- PHY_STATE_STR(CHANGELINK)
- PHY_STATE_STR(RESUMING)
}
return NULL;
@@ -936,8 +934,6 @@ void phy_state_machine(struct work_struct *work)
break;
case PHY_NOLINK:
case PHY_RUNNING:
- case PHY_CHANGELINK:
- case PHY_RESUMING:
err = phy_check_link_status(phydev);
break;
case PHY_FORCING:
diff --git a/include/linux/phy.h b/include/linux/phy.h
index 21e553f51..68fac589d 100644
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
@@ -301,20 +301,10 @@ struct phy_device *mdiobus_scan(struct mii_bus *bus, int
addr);
* - irq or timer will set NOLINK if link goes down
* - phy_stop moves to HALT
*
- * CHANGELINK: PHY experienced a change in link state
- * - timer moves to RUNNING if link
- * - timer moves to NOLINK if the link is down
- * - phy_stop moves to HALT
- *
* HALT: PHY is up, but no polling or interrupts are done. Or
* PHY is in an error state.
*
* - moves to READY
- *
- * RESUMING: PHY was halted, but now wants to run again.
- * - If we are forcing, or aneg is done, timer moves to RUNNING
- * - If aneg is not done, timer moves to AN
- * - phy_stop moves to HALT
*/
enum phy_state {
PHY_DOWN = 0,
@@ -324,8 +314,6 @@ enum phy_state {
PHY_RUNNING,
PHY_NOLINK,
PHY_FORCING,
- PHY_CHANGELINK,
- PHY_RESUMING
};
/**
--
2.20.1
