Commit 8a8f8281 authored by Heiner Kallweit's avatar Heiner Kallweit Committed by David S. Miller
Browse files

net: phy: don't touch suspended flag if there's no suspend/resume callback 



So far we set phydev->suspended to true in phy_suspend() even if the
PHY driver doesn't implement the suspend callback. This applies
accordingly for the resume path. The current behavior doesn't cause
any issue I'd be aware of, but it's not logical and misleading,
especially considering the description of the flag:
"suspended: Set to true if this phy has been suspended successfully"

Signed-off-by: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Reviewed-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 05cc6c5b

drivers/net/phy/phy_device.c

+15 −17
Original line number Diff line number Diff line
@@ -1519,22 +1519,21 @@ EXPORT_SYMBOL(phy_detach); 


int phy_suspend(struct phy_device *phydev)

{

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

	struct net_device *netdev = phydev->attached_dev;

	struct ethtool_wolinfo wol = { .cmd = ETHTOOL_GWOL };

	int ret = 0;

	struct net_device *netdev = phydev->attached_dev;

	struct phy_driver *phydrv = phydev->drv;

	int ret;



	/* If the device has WOL enabled, we cannot suspend the PHY */

	phy_ethtool_get_wol(phydev, &wol);

	if (wol.wolopts || (netdev && netdev->wol_enabled))

		return -EBUSY;



	if (phydev->drv && phydrv->suspend)

		ret = phydrv->suspend(phydev);



	if (ret)

		return ret;

	if (!phydrv || !phydrv->suspend)

		return 0;



	ret = phydrv->suspend(phydev);

	if (!ret)

		phydev->suspended = true;



	return ret;
@@ -1543,17 +1542,16 @@ EXPORT_SYMBOL(phy_suspend); 


int __phy_resume(struct phy_device *phydev)

{

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

	int ret = 0;

	struct phy_driver *phydrv = phydev->drv;

	int ret;



	WARN_ON(!mutex_is_locked(&phydev->lock));



	if (phydev->drv && phydrv->resume)

		ret = phydrv->resume(phydev);



	if (ret)

		return ret;

	if (!phydrv || !phydrv->resume)

		return 0;



	ret = phydrv->resume(phydev);

	if (!ret)

		phydev->suspended = false;



	return ret;

CRA Git | Maintained and supported by SUSTech CRA and CCSE