2017-08-09 14:40:30

by Romain Perier

Subject: [PATCH] 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.

Signed-off-by: Romain Perier <[email protected]>
---
drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
index db157a47000c..4c96511fe51f 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
@@ -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,14 @@ 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",
+ dev_info(dev, "PHY ID %08x at %d IRQ %s (%s)%s\n",
phydev->phy_id, addr, irq_str, phydev_name(phydev),
act ? " active" : "");
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;
--
2.11.0

2017-08-09 14:56:55

by Andrew Lunn

Subject: Re: [PATCH] net: stmmac: Use the right logging function in stmmac_mdio_register

On Wed, Aug 09, 2017 at 04:40:19PM +0200, Romain Perier wrote:
> @@ -285,14 +286,14 @@ 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",
> + dev_info(dev, "PHY ID %08x at %d IRQ %s (%s)%s\n",
> phydev->phy_id, addr, irq_str, phydev_name(phydev),
> act ? " active" : "");

Hi Romain

phy_attached_print() would be better.

Andrew

2017-08-09 14:58:29

by Romain Perier

Subject: Re: [PATCH] net: stmmac: Use the right logging function in stmmac_mdio_register

Hi Andrew,


Le 09/08/2017 à 16:56, Andrew Lunn a écrit :
> On Wed, Aug 09, 2017 at 04:40:19PM +0200, Romain Perier wrote:
>> @@ -285,14 +286,14 @@ 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",
>> + dev_info(dev, "PHY ID %08x at %d IRQ %s (%s)%s\n",
>> phydev->phy_id, addr, irq_str, phydev_name(phydev),
>> act ? " active" : "");
> Hi Romain
>
> phy_attached_print() would be better.
>
> Andrew
Ok, I did not know this function, good to know. I will investigate

Thanks,
Romain