net: stmmac: add wrappers for serdes_power[up|down]() methods

Add wrappers for the serdes_power[up|down]() methods and update all
call sites. This will allow us to add state tracking.

Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Link: https://patch.msgid.link/E1vnDDe-00000007Xww-2VUU@rmk-PC.armlinux.org.uk
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index 9500b332a15269ce53a3599e5594df14a9e24336..93d18709bc13b58371233ee717521234f3089093 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -882,6 +882,26 @@ static void stmmac_release_ptp(struct stmmac_priv *priv)
        clk_disable_unprepare(priv->plat->clk_ptp_ref);
 }
 
+static void stmmac_legacy_serdes_power_down(struct stmmac_priv *priv)
+{
+       if (priv->plat->serdes_powerdown)
+               priv->plat->serdes_powerdown(priv->dev, priv->plat->bsp_priv);
+}
+
+static int stmmac_legacy_serdes_power_up(struct stmmac_priv *priv)
+{
+       int ret;
+
+       if (!priv->plat->serdes_powerup)
+               return 0;
+
+       ret = priv->plat->serdes_powerup(priv->dev, priv->plat->bsp_priv);
+       if (ret < 0)
+               netdev_err(priv->dev, "SerDes powerup failed\n");
+
+       return ret;
+}
+
 /**
  *  stmmac_mac_flow_ctrl - Configure flow control in all queues
  *  @priv: driver private structure
@@ -981,9 +1001,8 @@ static void stmmac_mac_link_up(struct phylink_config *config,
        u32 old_ctrl, ctrl;
        int ret;
 
-       if ((priv->plat->flags & STMMAC_FLAG_SERDES_UP_AFTER_PHY_LINKUP) &&
-           priv->plat->serdes_powerup)
-               priv->plat->serdes_powerup(priv->dev, priv->plat->bsp_priv);
+       if (priv->plat->flags & STMMAC_FLAG_SERDES_UP_AFTER_PHY_LINKUP)
+               stmmac_legacy_serdes_power_up(priv);
 
        old_ctrl = readl(priv->ioaddr + MAC_CTRL_REG);
        ctrl = old_ctrl & ~priv->hw->link.speed_mask;
@@ -4111,14 +4130,10 @@ static int __stmmac_open(struct net_device *dev,
 
        stmmac_reset_queues_param(priv);
 
-       if (!(priv->plat->flags & STMMAC_FLAG_SERDES_UP_AFTER_PHY_LINKUP) &&
-           priv->plat->serdes_powerup) {
-               ret = priv->plat->serdes_powerup(dev, priv->plat->bsp_priv);
-               if (ret < 0) {
-                       netdev_err(priv->dev, "%s: Serdes powerup failed\n",
-                                  __func__);
+       if (!(priv->plat->flags & STMMAC_FLAG_SERDES_UP_AFTER_PHY_LINKUP)) {
+               ret = stmmac_legacy_serdes_power_up(priv);
+               if (ret < 0)
                        goto init_error;
-               }
        }
 
        ret = stmmac_hw_setup(dev);
@@ -4222,8 +4237,7 @@ static void __stmmac_release(struct net_device *dev)
        free_dma_desc_resources(priv, &priv->dma_conf);
 
        /* Powerdown Serdes if there is */
-       if (priv->plat->serdes_powerdown)
-               priv->plat->serdes_powerdown(dev, priv->plat->bsp_priv);
+       stmmac_legacy_serdes_power_down(priv);
 
        stmmac_release_ptp(priv);
 
@@ -8130,8 +8144,7 @@ int stmmac_suspend(struct device *dev)
        /* Stop TX/RX DMA */
        stmmac_stop_all_dma(priv);
 
-       if (priv->plat->serdes_powerdown)
-               priv->plat->serdes_powerdown(ndev, priv->plat->bsp_priv);
+       stmmac_legacy_serdes_power_down(priv);
 
        /* Enable Power down mode by programming the PMT regs */
        if (priv->wolopts) {
@@ -8233,11 +8246,8 @@ int stmmac_resume(struct device *dev)
                        stmmac_mdio_reset(priv->mii);
        }
 
-       if (!(priv->plat->flags & STMMAC_FLAG_SERDES_UP_AFTER_PHY_LINKUP) &&
-           priv->plat->serdes_powerup) {
-               ret = priv->plat->serdes_powerup(ndev,
-                                                priv->plat->bsp_priv);
-
+       if (!(priv->plat->flags & STMMAC_FLAG_SERDES_UP_AFTER_PHY_LINKUP)) {
+               ret = stmmac_legacy_serdes_power_up(priv);
                if (ret < 0)
                        return ret;
        }