net: phy: don't set state PHY_CHANGELINK in phy_change

State PHY_CHANGELINK isn't needed here, we can call the state machine
directly. We just have to remove the check for phy_polling_mode() to
make this work also in interrupt mode. Removing this check doesn't
cause any overhead because when not polling the state machine is
called only if required by some event.

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 8dac890..da41420 100644 (file)
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -738,11 +738,6 @@ static irqreturn_t phy_change(struct phy_device *phydev)
                                goto phy_err;
        }
 
                                goto phy_err;
        }
 

-       mutex_lock(&phydev->lock);
-       if ((PHY_RUNNING == phydev->state) || (PHY_NOLINK == phydev->state))
-               phydev->state = PHY_CHANGELINK;
-       mutex_unlock(&phydev->lock);
-

        /* reschedule state queue work to run as soon as possible */
        phy_trigger_machine(phydev);
 
        /* reschedule state queue work to run as soon as possible */
        phy_trigger_machine(phydev);
 


@@ -946,9 +941,6 @@ void phy_state_machine(struct work_struct *work)
                break;
        case PHY_NOLINK:
        case PHY_RUNNING:
                break;
        case PHY_NOLINK:
        case PHY_RUNNING:

-               if (!phy_polling_mode(phydev))
-                       break;
-               /* fall through */

        case PHY_CHANGELINK:
        case PHY_RESUMING:
                err = phy_check_link_status(phydev);
        case PHY_CHANGELINK:
        case PHY_RESUMING:
                err = phy_check_link_status(phydev);

diff --git a/include/linux/phy.h b/include/linux/phy.h
index 59bb31e..7db07e6 100644 (file)
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
@@ -298,7 +298,7 @@ struct phy_device *mdiobus_scan(struct mii_bus *bus, int addr);
  * - timer moves to NOLINK or RUNNING
  *
  * NOLINK: PHY is up, but not currently plugged in.
  * - timer moves to NOLINK or RUNNING
  *
  * NOLINK: PHY is up, but not currently plugged in.

- * - If the timer notes that the link comes back, we move to RUNNING
+ * - irq or timer will set RUNNING if link comes back

  * - phy_stop moves to HALTED
  *
  * FORCING: PHY is being configured with forced settings
  * - phy_stop moves to HALTED
  *
  * FORCING: PHY is being configured with forced settings


@@ -309,10 +309,7 @@ struct phy_device *mdiobus_scan(struct mii_bus *bus, int addr);
  *
  * RUNNING: PHY is currently up, running, and possibly sending
  * and/or receiving packets
  *
  * RUNNING: PHY is currently up, running, and possibly sending
  * and/or receiving packets

- * - timer will set CHANGELINK if we're polling (this ensures the
- *   link state is polled every other cycle of this state machine,
- *   which makes it every other second)
- * - irq will set CHANGELINK
+ * - irq or timer will set NOLINK if link goes down

  * - phy_stop moves to HALTED
  *
  * CHANGELINK: PHY experienced a change in link state
  * - phy_stop moves to HALTED
  *
  * CHANGELINK: PHY experienced a change in link state