net: stmmac: use dev_err_probe() for reporting mdio bus registration failure

[ Upstream commit 839612d23ffd933174db911ce56dc3f3ca883ec5 ]

I have a board where these two lines are always printed during boot:

   imx-dwmac 30bf0000.ethernet: Cannot register the MDIO bus
   imx-dwmac 30bf0000.ethernet: stmmac_dvr_probe: MDIO bus (id: 1) registration failed

It's perfectly fine, and the device is successfully (and silently, as
far as the console goes) probed later.

Use dev_err_probe() instead, which will demote these messages to debug
level (thus removing the alarming messages from the console) when the
error is -EPROBE_DEFER, and also has the advantage of including the
error code if/when it happens to be something other than -EPROBE_DEFER.

While here, add the missing \n to one of the format strings.

Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk>
Link: https://lore.kernel.org/r/20220602074840.1143360-1-linux@rasmusvillemoes.dk
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Stable-dep-of: e23c0d21ce92 ("net: stmmac: Handle disabled MDIO busses from devicetree")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index 91d6be7ade1bd762029b40be3e988509995c23bb..08693d7458d15b65fa7cd2a417a899ce2dccb1dd 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -7239,9 +7239,9 @@ int stmmac_dvr_probe(struct device *device,
                /* MDIO bus Registration */
                ret = stmmac_mdio_register(ndev);
                if (ret < 0) {
-                       dev_err(priv->device,
-                               "%s: MDIO bus (id: %d) registration failed",
-                               __func__, priv->plat->bus_id);
+                       dev_err_probe(priv->device, ret,
+                                     "%s: MDIO bus (id: %d) registration failed\n",
+                                     __func__, priv->plat->bus_id);
                        goto error_mdio_register;
                }
        }

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
index a5d150c5f3d8c6aaa3b27e7ff0eab315b07c5ab6..19694b3a1fb9ed84b307e73b6291c2d73903489b 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
@@ -490,7 +490,7 @@ int stmmac_mdio_register(struct net_device *ndev)
 
        err = of_mdiobus_register(new_bus, mdio_node);
        if (err != 0) {
-               dev_err(dev, "Cannot register the MDIO bus\n");
+               dev_err_probe(dev, err, "Cannot register the MDIO bus\n");
                goto bus_register_fail;
        }