Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9272efa2 authored by Florian Fainelli's avatar Florian Fainelli Committed by David S. Miller
Browse files

net: phy: utilize phy_suspend and phy_resume 



phy_suspend and phy_resume are an abstraction on top of the PHY device
driver suspend and resume callbacks, utilize those since they are the
proper interface to suspending and resuming a PHY device.

Acked-by: default avatarFugang Duan <B38611@freescale.com>
Tested-by: default avatarFugang Duan <B38611@freescale.com>
Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d2fa7cc4

drivers/net/phy/mdio_bus.c

+2 −4
Original line number Diff line number Diff line
@@ -465,7 +465,6 @@ static bool mdio_bus_phy_may_suspend(struct phy_device *phydev) 


static int mdio_bus_suspend(struct device *dev)

{

	struct phy_driver *phydrv = to_phy_driver(dev->driver);

	struct phy_device *phydev = to_phy_device(dev);



	/* We must stop the state machine manually, otherwise it stops out of
@@ -479,19 +478,18 @@ static int mdio_bus_suspend(struct device *dev) 
	if (!mdio_bus_phy_may_suspend(phydev))

		return 0;



	return phydrv->suspend(phydev);

	return phy_suspend(phydev);

}



static int mdio_bus_resume(struct device *dev)

{

	struct phy_driver *phydrv = to_phy_driver(dev->driver);

	struct phy_device *phydev = to_phy_device(dev);

	int ret;



	if (!mdio_bus_phy_may_suspend(phydev))

		goto no_resume;



	ret = phydrv->resume(phydev);

	ret = phy_resume(phydev);

	if (ret < 0)

		return ret;