net: phy: remove state PHY_CHANGELINK (e302c2a5) · Commits · 戴 / test

drivers/net/phy/phy.c

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -47,7 +47,6 @@ static const char *phy_state_to_str(enum phy_state st)
	PHY_STATE_STR(RUNNING)		PHY_STATE_STR(RUNNING)
	PHY_STATE_STR(NOLINK)		PHY_STATE_STR(NOLINK)
	PHY_STATE_STR(FORCING)		PHY_STATE_STR(FORCING)
	PHY_STATE_STR(CHANGELINK)
	PHY_STATE_STR(HALTED)		PHY_STATE_STR(HALTED)
	PHY_STATE_STR(RESUMING)		PHY_STATE_STR(RESUMING)
	}		}
	@@ -939,7 +938,6 @@ void phy_state_machine(struct work_struct *work)
	break;		break;
	case PHY_NOLINK:		case PHY_NOLINK:
	case PHY_RUNNING:		case PHY_RUNNING:
	case PHY_CHANGELINK:
	case PHY_RESUMING:		case PHY_RESUMING:
	err = phy_check_link_status(phydev);		err = phy_check_link_status(phydev);
	break;		break;

+0 −6

Original line number	Original line	Diff line number	Diff line
	@@ -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		* - irq or timer will set NOLINK if link goes down
	* - phy_stop moves to HALTED		* - 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		* HALTED: PHY is up, but no polling or interrupts are done. Or
	* PHY is in an error state.		* PHY is in an error state.
	*		*
	@@ -327,7 +322,6 @@ enum phy_state {
	PHY_RUNNING,		PHY_RUNNING,
	PHY_NOLINK,		PHY_NOLINK,
	PHY_FORCING,		PHY_FORCING,
	PHY_CHANGELINK,
	PHY_RESUMING		PHY_RESUMING
	};		};