Commit f732549e authored by Russell King (Oracle)'s avatar Russell King (Oracle) Committed by Jakub Kicinski
Browse files

net: stmmac: simplify phylink_suspend() and phylink_resume() calls 



Currently, the calls to phylink's suspend and resume functions are
inside overly complex tests, and boil down to:

	if (device_may_wakeup(priv->device) && priv->plat->pmt) {
		call phylink
	} else {
		call phylink and
		if (device_may_wakeup(priv->device))
			do something else
	}

This results in phylink always being called, possibly with differing
arguments for phylink_suspend().

Simplify this code, noting that each site is slightly different due to
the order in which phylink is called and the "something else".

Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
Reviewed-by: default avatarSimon Horman <horms@kernel.org>
Link: https://patch.msgid.link/E1tpQL1-005St4-Hn@rmk-PC.armlinux.org.uk


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 876cfb20

drivers/net/ethernet/stmicro/stmmac/stmmac_main.c

+8 −14
Original line number Diff line number Diff line
@@ -7842,13 +7842,11 @@ int stmmac_suspend(struct device *dev) 
	mutex_unlock(&priv->lock);



	rtnl_lock();

	if (device_may_wakeup(priv->device) && priv->plat->pmt) {

		phylink_suspend(priv->phylink, true);

	} else {

		if (device_may_wakeup(priv->device))

	if (device_may_wakeup(priv->device) && !priv->plat->pmt)

		phylink_speed_down(priv->phylink, false);

		phylink_suspend(priv->phylink, false);

	}



	phylink_suspend(priv->phylink,

			device_may_wakeup(priv->device) && priv->plat->pmt);

	rtnl_unlock();



	if (stmmac_fpe_supported(priv))
@@ -7938,13 +7936,9 @@ int stmmac_resume(struct device *dev) 
	}



	rtnl_lock();

	if (device_may_wakeup(priv->device) && priv->plat->pmt) {

		phylink_resume(priv->phylink);

	} else {

	phylink_resume(priv->phylink);

		if (device_may_wakeup(priv->device))

	if (device_may_wakeup(priv->device) && !priv->plat->pmt)

		phylink_speed_up(priv->phylink);

	}

	rtnl_unlock();



	rtnl_lock();