net: stmmac: move PHY attachment error message into stmmac_init_phy()

Move the "cannot attach to PHY" error message into stmmac_init_phy()
so we don't end up with multiple error messages printed when things
go wrong. Drop the function name from the message, and use %pe to
print the error code description rather than just a number.

Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Reviewed-by: Maxime Chevallier <maxime.chevallier@bootlin.com>
Link: https://patch.msgid.link/E1v119t-00000007744-2SxG@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 3b47d4ca24cacbac686a941a2de399775316cc38..8831bbda964c6a678d97543aed52ea143137fcf9 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -1157,7 +1157,10 @@ static int stmmac_init_phy(struct net_device *dev)
                ret = phylink_fwnode_phy_connect(priv->phylink, fwnode, 0);
        }
 
-       if (ret == 0) {
+       if (ret) {
+               netdev_err(priv->dev, "cannot attach to PHY (error: %pe)\n",
+                          ERR_PTR(ret));
+       } else {
                struct ethtool_keee eee;
 
                /* Configure phylib's copy of the LPI timer. Normally,
@@ -3939,12 +3942,8 @@ static int __stmmac_open(struct net_device *dev,
                priv->tx_lpi_timer = eee_timer * 1000;
 
        ret = stmmac_init_phy(dev);
-       if (ret) {
-               netdev_err(priv->dev,
-                          "%s: Cannot attach to PHY (error: %d)\n",
-                          __func__, ret);
+       if (ret)
                return ret;
-       }
 
        for (int i = 0; i < MTL_MAX_TX_QUEUES; i++)
                if (priv->dma_conf.tx_queue[i].tbs & STMMAC_TBS_EN)