net: phy: remove state PHY_CHANGELINK

Since recent changes to the phylib state machine state PHY_CHANGELINK
isn't used any longer. Therefore let's remove it.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index 241fb83ef4de0afde4b44c60ec1218771f6576ef..b0632e859564b5907316a25be2169261a60d04b9 100644 (file)
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -47,7 +47,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(HALTED)
        PHY_STATE_STR(RESUMING)
        }
@@ -939,7 +938,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;

diff --git a/include/linux/phy.h b/include/linux/phy.h
index f1c19bf8c658ff20bd5578758112b6572b4a121b..232d93b9cea473575be3a56a189a74995b637f5d 100644 (file)
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
@@ -304,11 +304,6 @@ 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 HALTED
  *
- * 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 HALTED
- *
  * HALTED: PHY is up, but no polling or interrupts are done. Or
  * PHY is in an error state.
  *
@@ -327,7 +322,6 @@ enum phy_state {
        PHY_RUNNING,
        PHY_NOLINK,
        PHY_FORCING,
-       PHY_CHANGELINK,
        PHY_RESUMING
 };