net: stmmac: simplify phylink_suspend() and phylink_resume() calls
Subsystems (4)
PATCH 1/1 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".
--- .../net/ethernet/stmicro/stmmac/stmmac_main.c | 22 +++++++------------ 1 file changed, 8 insertions(+), 14 deletions(-)
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +8 -14
@@ -7831,13 +7831,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)) -phylink_speed_down (priv->phylink, false); -phylink_suspend (priv->phylink, false); - } +if (device_may_wakeup (priv->device) && !priv->plat->pmt) +phylink_speed_down (priv->phylink, false); + +phylink_suspend (priv->phylink, +device_may_wakeup (priv->device) && priv->plat->pmt);rtnl_unlock ();if (stmmac_fpe_supported (priv))
@@ -7927,13 +7925,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)) -phylink_speed_up (priv->phylink); - } +phylink_resume (priv->phylink); +if (device_may_wakeup (priv->device) && !priv->plat->pmt) +phylink_speed_up (priv->phylink);rtnl_unlock ();rtnl_lock ();
Signature · 1 line
2.30.2
Quoted 11 lines · Russell King (Oracle)
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 }
Quoted 8 lines
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 Andrew Lunn <[email protected]>Signed-off-by Russell King (Oracle) <[email protected]>
This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:
Hello:
This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:
Quoted 11 lines · On Tue, 04 Mar 2025 11:21:27 +0000 you wrote:
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 }
Quoted 1 line
[...]
Here is the summary with links:
- [net-next] net: stmmac: simplify phylink_suspend() and phylink_resume() calls
https://git.kernel.org/netdev/net-next/c/f732549eb303
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html