Commit 899a3cbb authored by Heiner Kallweit's avatar Heiner Kallweit Committed by David S. Miller

net: phy: remove states PHY_STARTING and PHY_PENDING

Both states aren't used. Most likely they result from an idea that
never materialized. So remove them.
Signed-off-by: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b08794a9
...@@ -46,9 +46,7 @@ static const char *phy_state_to_str(enum phy_state st) ...@@ -46,9 +46,7 @@ static const char *phy_state_to_str(enum phy_state st)
{ {
switch (st) { switch (st) {
PHY_STATE_STR(DOWN) PHY_STATE_STR(DOWN)
PHY_STATE_STR(STARTING)
PHY_STATE_STR(READY) PHY_STATE_STR(READY)
PHY_STATE_STR(PENDING)
PHY_STATE_STR(UP) PHY_STATE_STR(UP)
PHY_STATE_STR(RUNNING) PHY_STATE_STR(RUNNING)
PHY_STATE_STR(NOLINK) PHY_STATE_STR(NOLINK)
...@@ -852,9 +850,6 @@ void phy_start(struct phy_device *phydev) ...@@ -852,9 +850,6 @@ void phy_start(struct phy_device *phydev)
mutex_lock(&phydev->lock); mutex_lock(&phydev->lock);
switch (phydev->state) { switch (phydev->state) {
case PHY_STARTING:
phydev->state = PHY_PENDING;
break;
case PHY_READY: case PHY_READY:
phydev->state = PHY_UP; phydev->state = PHY_UP;
break; break;
...@@ -902,9 +897,7 @@ void phy_state_machine(struct work_struct *work) ...@@ -902,9 +897,7 @@ void phy_state_machine(struct work_struct *work)
switch (phydev->state) { switch (phydev->state) {
case PHY_DOWN: case PHY_DOWN:
case PHY_STARTING:
case PHY_READY: case PHY_READY:
case PHY_PENDING:
break; break;
case PHY_UP: case PHY_UP:
needs_aneg = true; needs_aneg = true;
......
...@@ -270,29 +270,13 @@ struct phy_device *mdiobus_scan(struct mii_bus *bus, int addr); ...@@ -270,29 +270,13 @@ struct phy_device *mdiobus_scan(struct mii_bus *bus, int addr);
* DOWN: PHY device and driver are not ready for anything. probe * DOWN: PHY device and driver are not ready for anything. probe
* should be called if and only if the PHY is in this state, * should be called if and only if the PHY is in this state,
* given that the PHY device exists. * given that the PHY device exists.
* - PHY driver probe function will, depending on the PHY, set * - PHY driver probe function will set the state to READY
* the state to STARTING or READY
*
* STARTING: PHY device is coming up, and the ethernet driver is
* not ready. PHY drivers may set this in the probe function.
* If they do, they are responsible for making sure the state is
* eventually set to indicate whether the PHY is UP or READY,
* depending on the state when the PHY is done starting up.
* - PHY driver will set the state to READY
* - start will set the state to PENDING
* *
* READY: PHY is ready to send and receive packets, but the * READY: PHY is ready to send and receive packets, but the
* controller is not. By default, PHYs which do not implement * controller is not. By default, PHYs which do not implement
* probe will be set to this state by phy_probe(). If the PHY * probe will be set to this state by phy_probe().
* driver knows the PHY is ready, and the PHY state is STARTING,
* then it sets this STATE.
* - start will set the state to UP * - start will set the state to UP
* *
* PENDING: PHY device is coming up, but the ethernet driver is
* ready. phy_start will set this state if the PHY state is
* STARTING.
* - PHY driver will set the state to UP when the PHY is ready
*
* UP: The PHY and attached device are ready to do work. * UP: The PHY and attached device are ready to do work.
* Interrupts should be started here. * Interrupts should be started here.
* - timer moves to NOLINK or RUNNING * - timer moves to NOLINK or RUNNING
...@@ -329,9 +313,7 @@ struct phy_device *mdiobus_scan(struct mii_bus *bus, int addr); ...@@ -329,9 +313,7 @@ struct phy_device *mdiobus_scan(struct mii_bus *bus, int addr);
*/ */
enum phy_state { enum phy_state {
PHY_DOWN = 0, PHY_DOWN = 0,
PHY_STARTING,
PHY_READY, PHY_READY,
PHY_PENDING,
PHY_UP, PHY_UP,
PHY_RUNNING, PHY_RUNNING,
PHY_NOLINK, PHY_NOLINK,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment