phy: Revert toggling reset changes.

commit 7b566f70e1bf65b189b66eb3de6f431c30f7dff2 upstream.

This reverts:

ef1b5bf506b1 ("net: phy: Fix not to call phy_resume() if PHY is not attached")
8c85f4b81296 ("net: phy: micrel: add toggling phy reset if PHY is not  attached")

Andrew Lunn informs me that there are alternative efforts
underway to fix this more properly.

Signed-off-by: David S. Miller <davem@davemloft.net>
[just take the ef1b5bf506b1 revert - gregkh]
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
index ae40d81..1f4bce1 100644 (file)
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
@@ -76,7 +76,7 @@ static LIST_HEAD(phy_fixup_list);
 static DEFINE_MUTEX(phy_fixup_lock);
 
 #ifdef CONFIG_PM
-static bool mdio_bus_phy_may_suspend(struct phy_device *phydev, bool suspend)
+static bool mdio_bus_phy_may_suspend(struct phy_device *phydev)
 {
        struct device_driver *drv = phydev->mdio.dev.driver;
        struct phy_driver *phydrv = to_phy_driver(drv);
@@ -88,11 +88,10 @@ static bool mdio_bus_phy_may_suspend(struct phy_device *phydev, bool suspend)
        /* PHY not attached? May suspend if the PHY has not already been
         * suspended as part of a prior call to phy_disconnect() ->
         * phy_detach() -> phy_suspend() because the parent netdev might be the
-        * MDIO bus driver and clock gated at this point. Also may resume if
-        * PHY is not attached.
+        * MDIO bus driver and clock gated at this point.
         */
        if (!netdev)
-               return suspend ? !phydev->suspended : phydev->suspended;
+               return !phydev->suspended;
 
        if (netdev->wol_enabled)
                return false;
@@ -127,7 +126,7 @@ static int mdio_bus_phy_suspend(struct device *dev)
        if (phydev->attached_dev && phydev->adjust_link)
                phy_stop_machine(phydev);
 
-       if (!mdio_bus_phy_may_suspend(phydev, true))
+       if (!mdio_bus_phy_may_suspend(phydev))
                return 0;
 
        return phy_suspend(phydev);
@@ -138,7 +137,7 @@ static int mdio_bus_phy_resume(struct device *dev)
        struct phy_device *phydev = to_phy_device(dev);
        int ret;
 
-       if (!mdio_bus_phy_may_suspend(phydev, false))
+       if (!mdio_bus_phy_may_suspend(phydev))
                goto no_resume;
 
        ret = phy_resume(phydev);