Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fbca1647 authored by Romain Perier's avatar Romain Perier Committed by David S. Miller
Browse files

net: stmmac: Use the right logging function in stmmac_mdio_register 



Currently, the function stmmac_mdio_register() is only used by
stmmac_dvr_probe() from stmmac_main.c, in order to register the MDIO bus
and probe information about the PHY. As this function is called before
calling register_netdev(), all messages logged from stmmac_mdio_register
are prefixed by "(unnamed net_device)". The goal of netdev_info or
netdev_err is to dump useful infos about a net_device, when this data
structure is partially initialized, there is no point for using these
functions.

This commit fixes the issue by replacing all netdev_*() by the
corresponding dev_*() function for logging. The last netdev_info is
replaced by phy_attached_info(), as a valid phydev can be used at this
point.

Signed-off-by: default avatarRomain Perier <romain.perier@collabora.com>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8d553738

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

+4 −5
Original line number Diff line number Diff line
@@ -204,6 +204,7 @@ int stmmac_mdio_register(struct net_device *ndev) 
	struct stmmac_priv *priv = netdev_priv(ndev);

	struct stmmac_mdio_bus_data *mdio_bus_data = priv->plat->mdio_bus_data;

	struct device_node *mdio_node = priv->plat->mdio_node;

	struct device *dev = ndev->dev.parent;

	int addr, found;



	if (!mdio_bus_data)
@@ -237,7 +238,7 @@ int stmmac_mdio_register(struct net_device *ndev) 
	else

		err = mdiobus_register(new_bus);

	if (err != 0) {

		netdev_err(ndev, "Cannot register the MDIO bus\n");

		dev_err(dev, "Cannot register the MDIO bus\n");

		goto bus_register_fail;

	}
@@ -285,14 +286,12 @@ int stmmac_mdio_register(struct net_device *ndev) 
			irq_str = irq_num;

			break;

		}

		netdev_info(ndev, "PHY ID %08x at %d IRQ %s (%s)%s\n",

			    phydev->phy_id, addr, irq_str, phydev_name(phydev),

			    act ? " active" : "");

		phy_attached_info(phydev);

		found = 1;

	}



	if (!found && !mdio_node) {

		netdev_warn(ndev, "No PHY found\n");

		dev_warn(dev, "No PHY found\n");

		mdiobus_unregister(new_bus);

		mdiobus_free(new_bus);

		return -ENODEV;