of: mdio: Fall back to mdiobus_register() with NULL device_node
Subsystems (16)
v2 cover of: mdio: Fall back to mdiobus_register() with NULL device_node
Hi all,
This patch series updates of_mdiobus_register() such that when the device_node argument is NULL, it calls mdiobus_register() directly. This is consistent with the behavior of of_mdiobus_register() when CONFIG_OF=n.
I only converted the most obvious drivers, there are others that have a much less obvious behavior and specifically attempt to deal with CONFIG_ACPI.
Changes in v2:
- fixed build error in davincin_mdio.c (Grygorii)
- reworked first patch a bit: commit message, subject and removed useless code comment
Florian Fainelli (2):
of: mdio: Fall back to mdiobus_register() with NULL device_node
drivers: net: Remove device_node checks with of_mdiobus_register()
drivers/net/dsa/bcm_sf2.c | 8 ++------ drivers/net/dsa/mv88e6xxx/chip.c | 5 +---- drivers/net/ethernet/cadence/macb_main.c | 12 +++--------- drivers/net/ethernet/freescale/fec_main.c | 8 ++------ drivers/net/ethernet/marvell/mvmdio.c | 5 +---- drivers/net/ethernet/renesas/sh_eth.c | 11 +++-------- drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c | 5 +---- drivers/net/ethernet/ti/davinci_mdio.c | 8 +++----- drivers/net/phy/mdio-gpio.c | 6 +----- drivers/net/phy/mdio-mscc-miim.c | 6 +----- drivers/net/usb/lan78xx.c | 7 ++----- drivers/of/of_mdio.c | 3 +++ 12 files changed, 23 insertions(+), 61 deletions(-)
Signature · 1 line
2.14.1
PATCH v2 1/2 of: mdio: Fall back to mdiobus_register() with NULL device_node
When the device_node specified is NULL, fall back to mdiobus_register(). We have a number of drivers having a similar pattern which is:
if (np)
of_mdiobus_register()
else
mdiobus_register()
so incorporate that behavior within the core of_mdiobus_register() function. This is also consistent with the stub version that we defined when CONFIG_OF=n.
--- drivers/of/of_mdio.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/of/of_mdio.c +3 -0
@@ -204,6 +204,9 @@ int of_mdiobus_register(struct mii_bus *mdio, struct device_node *np)bool scanphys = false;int addr, rc; +if (!np) +return mdiobus_register (mdio); +/* Do not continue if the node is disabled */ if (!of_device_is_available (np))return -ENODEV ;
Signature · 1 line
2.14.1
PATCH v2 2/2 drivers: net: Remove device_node checks with of_mdiobus_register()
In reply to Florian FainelliA number of drivers have the following pattern:
if (np)
of_mdiobus_register()
else
mdiobus_register()
which the implementation of of_mdiobus_register() now takes care of. Remove that pattern in drivers that strictly adhere to it.
--- drivers/net/dsa/bcm_sf2.c | 8 ++------ drivers/net/dsa/mv88e6xxx/chip.c | 5 +---- drivers/net/ethernet/cadence/macb_main.c | 12 +++--------- drivers/net/ethernet/freescale/fec_main.c | 8 ++------ drivers/net/ethernet/marvell/mvmdio.c | 5 +---- drivers/net/ethernet/renesas/sh_eth.c | 11 +++-------- drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c | 5 +---- drivers/net/ethernet/ti/davinci_mdio.c | 8 +++----- drivers/net/phy/mdio-gpio.c | 6 +----- drivers/net/phy/mdio-mscc-miim.c | 6 +----- drivers/net/usb/lan78xx.c | 7 ++----- 11 files changed, 20 insertions(+), 61 deletions(-)
drivers/net/dsa/bcm_sf2.c +2 -6
@@ -450,12 +450,8 @@ static int bcm_sf2_mdio_register(struct dsa_switch *ds) priv->slave_mii_bus->parent = ds->dev->parent; priv->slave_mii_bus->phy_mask = ~priv->indir_phy_mask; -if (dn) - err =of_mdiobus_register (priv->slave_mii_bus, dn); -else - err =mdiobus_register (priv->slave_mii_bus); - -if (err) + err =of_mdiobus_register (priv->slave_mii_bus, dn); +if (err && dn)of_node_put (dn);return err;
drivers/net/dsa/mv88e6xxx/chip.c +1 -4
@@ -2454,10 +2454,7 @@ static int mv88e6xxx_mdio_register(struct mv88e6xxx_chip *chip,return err; } -if (np) - err =of_mdiobus_register (bus, np); -else - err =mdiobus_register (bus); + err =of_mdiobus_register (bus, np);if (err) {dev_err (chip->dev,"Cannot register MDIO bus (%d)\n" , err);mv88e6xxx_g2_irq_mdio_free (chip, bus);
drivers/net/ethernet/cadence/macb_main.c +3 -9
@@ -591,16 +591,10 @@ static int macb_mii_init(struct macb *bp)dev_set_drvdata (&bp->dev->dev, bp->mii_bus); np = bp->pdev->dev.of_node; +if (pdata) + bp->mii_bus->phy_mask = pdata->phy_mask; -if (np) { - err =of_mdiobus_register (bp->mii_bus, np); - }else { -if (pdata) - bp->mii_bus->phy_mask = pdata->phy_mask; - - err =mdiobus_register (bp->mii_bus); - } - + err =of_mdiobus_register (bp->mii_bus, np);if (err) goto err_out_free_mdiobus;
drivers/net/ethernet/freescale/fec_main.c +2 -6
@@ -2052,13 +2052,9 @@ static int fec_enet_mii_init(struct platform_device *pdev) fep->mii_bus->parent = &pdev->dev; node =of_get_child_by_name (pdev->dev.of_node,"mdio" ); -if (node) { - err =of_mdiobus_register (fep->mii_bus, node); + err =of_mdiobus_register (fep->mii_bus, node); +if (node)of_node_put (node); - }else { - err =mdiobus_register (fep->mii_bus); - } -if (err) goto err_out_free_mdiobus;
drivers/net/ethernet/marvell/mvmdio.c +1 -4
@@ -348,10 +348,7 @@ static int orion_mdio_probe(struct platform_device *pdev) goto out_mdio; } -if (pdev->dev.of_node) - ret =of_mdiobus_register (bus, pdev->dev.of_node); -else - ret =mdiobus_register (bus); + ret =of_mdiobus_register (bus, pdev->dev.of_node);if (ret <0 ) {dev_err (&pdev->dev,"Cannot register MDIO bus (%d)\n" , ret); goto out_mdio;
drivers/net/ethernet/renesas/sh_eth.c +3 -8
@@ -3025,15 +3025,10 @@ static int sh_mdio_init(struct sh_eth_private *mdp, pdev->name, pdev->id);/* register MDIO bus */ -if (dev->of_node) { - ret =of_mdiobus_register (mdp->mii_bus, dev->of_node); - }else { -if (pd->phy_irq >0 ) - mdp->mii_bus->irq[pd->phy] = pd->phy_irq; - - ret =mdiobus_register (mdp->mii_bus); - } +if (pd->phy_irq >0 ) + mdp->mii_bus->irq[pd->phy] = pd->phy_irq; + ret =of_mdiobus_register (mdp->mii_bus, dev->of_node);if (ret) goto out_free_bus;
drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c +1 -4
@@ -233,10 +233,7 @@ int stmmac_mdio_register(struct net_device *ndev) new_bus->phy_mask = mdio_bus_data->phy_mask; new_bus->parent = priv->device; -if (mdio_node) - err =of_mdiobus_register (new_bus, mdio_node); -else - err =mdiobus_register (new_bus); + err =of_mdiobus_register (new_bus, mdio_node);if (err !=0 ) {dev_err (dev,"Cannot register the MDIO bus\n" ); goto bus_register_fail;
drivers/net/ethernet/ti/davinci_mdio.c +3 -5
@@ -429,12 +429,10 @@ static int davinci_mdio_probe(struct platform_device *pdev)* defined to support backward compatibility with DTs which assume that * Davinci MDIO will always scan the bus for PHYs detection. */ -if (dev->of_node &&of_get_child_count (dev->of_node)) { +if (dev->of_node &&of_get_child_count (dev->of_node)) data->skip_scan = true; - ret =of_mdiobus_register (data->bus, dev->of_node); - }else { - ret =mdiobus_register (data->bus); - } + + ret =of_mdiobus_register (data->bus, dev->of_node);if (ret) goto bail_out;
drivers/net/phy/mdio-gpio.c +1 -5
@@ -179,11 +179,7 @@ static int mdio_gpio_probe(struct platform_device *pdev)if (!new_bus)return -ENODEV ; -if (pdev->dev.of_node) - ret =of_mdiobus_register (new_bus, pdev->dev.of_node); -else - ret =mdiobus_register (new_bus); - + ret =of_mdiobus_register (new_bus, pdev->dev.of_node);if (ret)mdio_gpio_bus_deinit (&pdev->dev);
drivers/net/phy/mdio-mscc-miim.c +1 -5
@@ -151,11 +151,7 @@ static int mscc_miim_probe(struct platform_device *pdev) } } -if (pdev->dev.of_node) - ret =of_mdiobus_register (bus, pdev->dev.of_node); -else - ret =mdiobus_register (bus); - + ret =of_mdiobus_register (bus, pdev->dev.of_node);if (ret <0 ) {dev_err (&pdev->dev,"Cannot register MDIO bus (%d)\n" , ret);return ret;
drivers/net/usb/lan78xx.c +2 -5
@@ -1843,12 +1843,9 @@ static int lan78xx_mdio_init(struct lan78xx_net *dev) } node =of_get_child_by_name (dev->udev->dev.of_node,"mdio" ); -if (node) { - ret =of_mdiobus_register (dev->mdiobus, node); + ret =of_mdiobus_register (dev->mdiobus, node); +if (node)of_node_put (node); - }else { - ret =mdiobus_register (dev->mdiobus); - }if (ret) {netdev_err (dev->net,"can't register MDIO bus\n" ); goto exit1;
Signature · 1 line
2.14.1
Re: [PATCH net-next v2 2/2] drivers: net: Remove device_node checks with of_mdiobus_register()
Quoted 11 lines · Florian Fainelli
A number of drivers have the following pattern:
if (np)
of_mdiobus_register()
else
mdiobus_register()which the implementation of
of_mdiobus_register()now takes care of. Remove that pattern in drivers that strictly adhere to it.Signed-off-by Florian Fainelli <[email protected]>
Quoted 9 lines
--- drivers/net/dsa/bcm_sf2.c | 8 ++------ drivers/net/dsa/mv88e6xxx/chip.c | 5 +---- drivers/net/ethernet/cadence/macb_main.c | 12 +++--------- drivers/net/ethernet/freescale/fec_main.c | 8 ++------ drivers/net/ethernet/marvell/mvmdio.c | 5 +---- drivers/net/ethernet/renesas/sh_eth.c | 11 +++-------- drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c | 5 +---- drivers/net/ethernet/ti/davinci_mdio.c | 8 +++-----
for drivers/net/ethernet/ti/davinci_mdio.c:
Quoted 4 lines
drivers/net/phy/mdio-gpio.c | 6 +----- drivers/net/phy/mdio-mscc-miim.c | 6 +----- drivers/net/usb/lan78xx.c | 7 ++----- 11 files changed, 20 insertions(+), 61 deletions(-)
Signature · 2 lines
regards, -grygorii
RE: [PATCH net-next v2 2/2] drivers: net: Remove device_node checks with of_mdiobus_register()
In reply to Florian FainelliFrom: Florian Fainelli <[email protected]> Sent: 2018年5月16日 7:56
Quoted 11 lines
A number of drivers have the following pattern:
if (np)
of_mdiobus_register()
else
mdiobus_register()which the implementation of
of_mdiobus_register()now takes care of. Remove that pattern in drivers that strictly adhere to it.Signed-off-by Florian Fainelli <[email protected]>
For drivers/net/ethernet/freescale/fec_main.c:
Quoted 240 lines
--- drivers/net/dsa/bcm_sf2.c | 8 ++------ drivers/net/dsa/mv88e6xxx/chip.c | 5 +---- drivers/net/ethernet/cadence/macb_main.c | 12 +++--------- drivers/net/ethernet/freescale/fec_main.c | 8 ++------ drivers/net/ethernet/marvell/mvmdio.c | 5 +---- drivers/net/ethernet/renesas/sh_eth.c | 11 +++-------- drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c | 5 +---- drivers/net/ethernet/ti/davinci_mdio.c | 8 +++----- drivers/net/phy/mdio-gpio.c | 6 +----- drivers/net/phy/mdio-mscc-miim.c | 6 +----- drivers/net/usb/lan78xx.c | 7 ++----- 11 files changed, 20 insertions(+), 61 deletions(-)drivers/net/dsa/bcm_sf2.c index renamed from drivers/net/dsa/bcm_sf2.c +0
-0
ac621f44237a..02e8982519ce100644drivers/net/dsa/bcm_sf2.c +2
-6@@ -450,12 +450,8 @@ static int bcm_sf2_mdio_register(struct dsa_switch *ds) priv->slave_mii_bus->parent = ds->dev->parent; priv->slave_mii_bus->phy_mask = ~priv->indir_phy_mask; -if (dn) - err =of_mdiobus_register (priv->slave_mii_bus, dn); -else - err =mdiobus_register (priv->slave_mii_bus); - -if (err) + err =of_mdiobus_register (priv->slave_mii_bus, dn); +if (err && dn)of_node_put (dn);drivers/net/dsa/bcm_sf2.c +0
-0return err;drivers/net/dsa/mv88e6xxx/chip.c +1
-4@@ -2454,10 +2454,7 @@ static int mv88e6xxx_mdio_register(structmv88e6xxx_chip *chip, return err; } -if (np) - err =of_mdiobus_register (bus, np); -else - err =mdiobus_register (bus); + err =of_mdiobus_register (bus, np);if (err) {dev_err (chip->dev,"Cannot register MDIO bus (%d)\n" , err);
mv88e6xxx_g2_irq_mdio_free(chip, bus); diff --gita/drivers/net/ethernet/cadence/macb_main.cb/drivers/net/ethernet/cadence/macb_main.c
indexb4c9268100bb..3e93df5d4e3b100644drivers/net/ethernet/cadence/macb_main.c +3
-9@@ -591,16 +591,10 @@ static int macb_mii_init(struct macb *bp)dev_set_drvdata (&bp->dev->dev, bp->mii_bus); np = bp->pdev->dev.of_node; +if (pdata) + bp->mii_bus->phy_mask = pdata->phy_mask; -if (np) { - err =of_mdiobus_register (bp->mii_bus, np); - }else { -if (pdata) - bp->mii_bus->phy_mask = pdata->phy_mask; - - err =mdiobus_register (bp->mii_bus); - } - + err =of_mdiobus_register (bp->mii_bus, np);if (err) goto err_out_free_mdiobus;drivers/net/ethernet/freescale/fec_main.c +2
-6@@ -2052,13 +2052,9 @@ static int fec_enet_mii_init(struct platform_device *pdev) fep->mii_bus->parent = &pdev->dev; node =of_get_child_by_name (pdev->dev.of_node,"mdio" ); -if (node) { - err =of_mdiobus_register (fep->mii_bus, node); + err =of_mdiobus_register (fep->mii_bus, node); +if (node)of_node_put (node); - }else { - err =mdiobus_register (fep->mii_bus); - } -if (err) goto err_out_free_mdiobus;drivers/net/ethernet/marvell/mvmdio.c +1
-4@@ -348,10 +348,7 @@ static int orion_mdio_probe(struct platform_device *pdev) goto out_mdio; } -if (pdev->dev.of_node) - ret =of_mdiobus_register (bus, pdev->dev.of_node); -else - ret =mdiobus_register (bus); + ret =of_mdiobus_register (bus, pdev->dev.of_node);if (ret <0 ) {dev_err (&pdev->dev,"Cannot register MDIO bus (%d)\n" , ret);drivers/net/ethernet/marvell/mvmdio.c +0
-0goto out_mdio;drivers/net/ethernet/renesas/sh_eth.c +3
-8@@ -3025,15 +3025,10 @@ static int sh_mdio_init(struct sh_eth_private *mdp, pdev->name, pdev->id);/* register MDIO bus */ -if (dev->of_node) { - ret =of_mdiobus_register (mdp->mii_bus, dev->of_node); - }else { -if (pd->phy_irq >0 ) - mdp->mii_bus->irq[pd->phy] = pd->phy_irq; - - ret =mdiobus_register (mdp->mii_bus); - } +if (pd->phy_irq >0 ) + mdp->mii_bus->irq[pd->phy] = pd->phy_irq; + ret =of_mdiobus_register (mdp->mii_bus, dev->of_node);if (ret) goto out_free_bus;drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c +1
-4@@ -233,10 +233,7 @@ int stmmac_mdio_register(struct net_device *ndev) new_bus->phy_mask = mdio_bus_data->phy_mask; new_bus->parent = priv->device; -if (mdio_node) - err =of_mdiobus_register (new_bus, mdio_node); -else - err =mdiobus_register (new_bus); + err =of_mdiobus_register (new_bus, mdio_node);if (err !=0 ) {dev_err (dev,"Cannot register the MDIO bus\n" ); goto bus_register_fail;drivers/net/ethernet/ti/davinci_mdio.c +3
-5@@ -429,12 +429,10 @@ static int davinci_mdio_probe(structplatform_device *pdev) * defined to support backward compatibility with DTs which assume that * Davinci MDIO will always scan the bus for PHYs detection. */ -if (dev->of_node &&of_get_child_count (dev->of_node)) { +if (dev->of_node &&of_get_child_count (dev->of_node)) data->skip_scan = true; - ret =of_mdiobus_register (data->bus, dev->of_node); - }else { - ret =mdiobus_register (data->bus); - } + + ret =of_mdiobus_register (data->bus, dev->of_node);if (ret) goto bail_out;drivers/net/phy/mdio-gpio.c index renamed from drivers/net/phy/mdio-gpio.c +0
-0
b501221819e1..4e4c8daf44c3100644drivers/net/phy/mdio-gpio.c +1
-5@@ -179,11 +179,7 @@ static int mdio_gpio_probe(struct platform_device *pdev)if (!new_bus)return -ENODEV ; -if (pdev->dev.of_node) - ret =of_mdiobus_register (new_bus, pdev->dev.of_node); -else - ret =mdiobus_register (new_bus); - + ret =of_mdiobus_register (new_bus, pdev->dev.of_node);if (ret)mdio_gpio_bus_deinit (&pdev->dev);drivers/net/phy/mdio-mscc-miim.c +1
-5@@ -151,11 +151,7 @@ static int mscc_miim_probe(struct platform_device *pdev) } } -if (pdev->dev.of_node) - ret =of_mdiobus_register (bus, pdev->dev.of_node); -else - ret =mdiobus_register (bus); - + ret =of_mdiobus_register (bus, pdev->dev.of_node);if (ret <0 ) {dev_err (&pdev->dev,"Cannot register MDIO bus (%d)\n" , ret);drivers/net/phy/mdio-mscc-miim.c +0
-0return ret;drivers/net/usb/lan78xx.c index renamed from drivers/net/usb/lan78xx.c +0
-0
91761436709a..8dff87ec6d99100644drivers/net/usb/lan78xx.c +2
-5@@ -1843,12 +1843,9 @@ static int lan78xx_mdio_init(struct lan78xx_net *dev) } node =of_get_child_by_name (dev->udev->dev.of_node,"mdio" ); -if (node) { - ret =of_mdiobus_register (dev->mdiobus, node); + ret =of_mdiobus_register (dev->mdiobus, node); +if (node)of_node_put (node); - }else { - ret =mdiobus_register (dev->mdiobus); - }if (ret) {netdev_err (dev->net,"can't register MDIO bus\n" );goto exit1;
--
2.14.1
Re: [PATCH net-next v2 2/2] drivers: net: Remove device_node checks with of_mdiobus_register()
In reply to Florian FainelliHi Florian,
Quoted 10 lines · Florian Fainelli
A number of drivers have the following pattern:
if (np)
of_mdiobus_register()
else
mdiobus_register()which the implementation of
of_mdiobus_register()now takes care of. Remove that pattern in drivers that strictly adhere to it.
Quoted 7 lines
Signed-off-by Florian Fainelli <[email protected]>--- drivers/net/dsa/bcm_sf2.c | 8 ++------ drivers/net/dsa/mv88e6xxx/chip.c | 5 +---- drivers/net/ethernet/cadence/macb_main.c | 12 +++--------- drivers/net/ethernet/freescale/fec_main.c | 8 ++------ drivers/net/ethernet/marvell/mvmdio.c | 5 +----
For mvmdio,
Thanks!
Antoine
Quoted 218 lines
drivers/net/ethernet/renesas/sh_eth.c | 11 +++-------- drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c | 5 +---- drivers/net/ethernet/ti/davinci_mdio.c | 8 +++----- drivers/net/phy/mdio-gpio.c | 6 +----- drivers/net/phy/mdio-mscc-miim.c | 6 +----- drivers/net/usb/lan78xx.c | 7 ++----- 11 files changed, 20 insertions(+), 61 deletions(-)drivers/net/dsa/bcm_sf2.c +2
-6@@ -450,12 +450,8 @@ static int bcm_sf2_mdio_register(struct dsa_switch *ds) priv->slave_mii_bus->parent = ds->dev->parent; priv->slave_mii_bus->phy_mask = ~priv->indir_phy_mask; -if (dn) - err =of_mdiobus_register (priv->slave_mii_bus, dn); -else - err =mdiobus_register (priv->slave_mii_bus); - -if (err) + err =of_mdiobus_register (priv->slave_mii_bus, dn); +if (err && dn)of_node_put (dn);return err;drivers/net/dsa/mv88e6xxx/chip.c +1
-4@@ -2454,10 +2454,7 @@ static int mv88e6xxx_mdio_register(struct mv88e6xxx_chip *chip,return err; } -if (np) - err =of_mdiobus_register (bus, np); -else - err =mdiobus_register (bus); + err =of_mdiobus_register (bus, np);if (err) {dev_err (chip->dev,"Cannot register MDIO bus (%d)\n" , err);mv88e6xxx_g2_irq_mdio_free (chip, bus);drivers/net/ethernet/cadence/macb_main.c +3
-9@@ -591,16 +591,10 @@ static int macb_mii_init(struct macb *bp)dev_set_drvdata (&bp->dev->dev, bp->mii_bus); np = bp->pdev->dev.of_node; +if (pdata) + bp->mii_bus->phy_mask = pdata->phy_mask; -if (np) { - err =of_mdiobus_register (bp->mii_bus, np); - }else { -if (pdata) - bp->mii_bus->phy_mask = pdata->phy_mask; - - err =mdiobus_register (bp->mii_bus); - } - + err =of_mdiobus_register (bp->mii_bus, np);if (err) goto err_out_free_mdiobus;drivers/net/ethernet/freescale/fec_main.c +2
-6@@ -2052,13 +2052,9 @@ static int fec_enet_mii_init(struct platform_device *pdev) fep->mii_bus->parent = &pdev->dev; node =of_get_child_by_name (pdev->dev.of_node,"mdio" ); -if (node) { - err =of_mdiobus_register (fep->mii_bus, node); + err =of_mdiobus_register (fep->mii_bus, node); +if (node)of_node_put (node); - }else { - err =mdiobus_register (fep->mii_bus); - } -if (err) goto err_out_free_mdiobus;drivers/net/ethernet/marvell/mvmdio.c +1
-4@@ -348,10 +348,7 @@ static int orion_mdio_probe(struct platform_device *pdev) goto out_mdio; } -if (pdev->dev.of_node) - ret =of_mdiobus_register (bus, pdev->dev.of_node); -else - ret =mdiobus_register (bus); + ret =of_mdiobus_register (bus, pdev->dev.of_node);if (ret <0 ) {dev_err (&pdev->dev,"Cannot register MDIO bus (%d)\n" , ret); goto out_mdio;drivers/net/ethernet/renesas/sh_eth.c +3
-8@@ -3025,15 +3025,10 @@ static int sh_mdio_init(struct sh_eth_private *mdp, pdev->name, pdev->id);/* register MDIO bus */ -if (dev->of_node) { - ret =of_mdiobus_register (mdp->mii_bus, dev->of_node); - }else { -if (pd->phy_irq >0 ) - mdp->mii_bus->irq[pd->phy] = pd->phy_irq; - - ret =mdiobus_register (mdp->mii_bus); - } +if (pd->phy_irq >0 ) + mdp->mii_bus->irq[pd->phy] = pd->phy_irq; + ret =of_mdiobus_register (mdp->mii_bus, dev->of_node);if (ret) goto out_free_bus;drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c +1
-4@@ -233,10 +233,7 @@ int stmmac_mdio_register(struct net_device *ndev) new_bus->phy_mask = mdio_bus_data->phy_mask; new_bus->parent = priv->device; -if (mdio_node) - err =of_mdiobus_register (new_bus, mdio_node); -else - err =mdiobus_register (new_bus); + err =of_mdiobus_register (new_bus, mdio_node);if (err !=0 ) {dev_err (dev,"Cannot register the MDIO bus\n" ); goto bus_register_fail;drivers/net/ethernet/ti/davinci_mdio.c +3
-5@@ -429,12 +429,10 @@ static int davinci_mdio_probe(struct platform_device *pdev)* defined to support backward compatibility with DTs which assume that * Davinci MDIO will always scan the bus for PHYs detection. */ -if (dev->of_node &&of_get_child_count (dev->of_node)) { +if (dev->of_node &&of_get_child_count (dev->of_node)) data->skip_scan = true; - ret =of_mdiobus_register (data->bus, dev->of_node); - }else { - ret =mdiobus_register (data->bus); - } + + ret =of_mdiobus_register (data->bus, dev->of_node);if (ret) goto bail_out;drivers/net/phy/mdio-gpio.c +1
-5@@ -179,11 +179,7 @@ static int mdio_gpio_probe(struct platform_device *pdev)if (!new_bus)return -ENODEV ; -if (pdev->dev.of_node) - ret =of_mdiobus_register (new_bus, pdev->dev.of_node); -else - ret =mdiobus_register (new_bus); - + ret =of_mdiobus_register (new_bus, pdev->dev.of_node);if (ret)mdio_gpio_bus_deinit (&pdev->dev);drivers/net/phy/mdio-mscc-miim.c +1
-5@@ -151,11 +151,7 @@ static int mscc_miim_probe(struct platform_device *pdev) } } -if (pdev->dev.of_node) - ret =of_mdiobus_register (bus, pdev->dev.of_node); -else - ret =mdiobus_register (bus); - + ret =of_mdiobus_register (bus, pdev->dev.of_node);if (ret <0 ) {dev_err (&pdev->dev,"Cannot register MDIO bus (%d)\n" , ret);return ret;drivers/net/usb/lan78xx.c +2
-5@@ -1843,12 +1843,9 @@ static int lan78xx_mdio_init(struct lan78xx_net *dev) } node =of_get_child_by_name (dev->udev->dev.of_node,"mdio" ); -if (node) { - ret =of_mdiobus_register (dev->mdiobus, node); + ret =of_mdiobus_register (dev->mdiobus, node); +if (node)of_node_put (node); - }else { - ret =mdiobus_register (dev->mdiobus); - }if (ret) {netdev_err (dev->net,"can't register MDIO bus\n" ); goto exit1;Signature · 1 line
2.14.1
Signature · 3 lines
Antoine Ténart, Bootlin (formerly Free Electrons) Embedded Linux and Kernel engineering https://bootlin.com
Re: [PATCH net-next v2 2/2] drivers: net: Remove device_node checks with of_mdiobus_register()
In reply to Florian FainelliQuoted 11 lines · Florian Fainelli
A number of drivers have the following pattern:
if (np)
of_mdiobus_register()
else
mdiobus_register()which the implementation of
of_mdiobus_register()now takes care of. Remove that pattern in drivers that strictly adhere to it.Signed-off-by Florian Fainelli <[email protected]>
Quoted 8 lines
--- drivers/net/dsa/bcm_sf2.c | 8 ++------ drivers/net/dsa/mv88e6xxx/chip.c | 5 +---- drivers/net/ethernet/cadence/macb_main.c | 12 +++--------- drivers/net/ethernet/freescale/fec_main.c | 8 ++------ drivers/net/ethernet/marvell/mvmdio.c | 5 +---- drivers/net/ethernet/renesas/sh_eth.c | 11 +++-------- drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c | 5 +----
For stmmac:
Thanks and Best Regards,
Jose Miguel Abreu
Quoted 6 lines
drivers/net/ethernet/ti/davinci_mdio.c | 8 +++----- drivers/net/phy/mdio-gpio.c | 6 +----- drivers/net/phy/mdio-mscc-miim.c | 6 +----- drivers/net/usb/lan78xx.c | 7 ++----- 11 files changed, 20 insertions(+), 61 deletions(-)
Re: [PATCH net-next v2 2/2] drivers: net: Remove device_node checks with of_mdiobus_register()
In reply to Florian FainelliHello!
Quoted 11 lines · Florian Fainelli
A number of drivers have the following pattern:
if (np)
of_mdiobus_register()
else
mdiobus_register()which the implementation of
of_mdiobus_register()now takes care of. Remove that pattern in drivers that strictly adhere to it.Signed-off-by Florian Fainelli <[email protected]>
[...]
Quoted 6 lines
drivers/net/dsa/bcm_sf2.c +0
-0@@ -450,12 +450,8 @@ static int bcm_sf2_mdio_register(struct dsa_switch *ds) priv->slave_mii_bus->parent = ds->dev->parent;
drivers/net/dsa/bcm_sf2.c static int bcm_sf2_mdio_register(struct dsa_switch *ds) · line 454
Quoted 10 lines
drivers/net/dsa/bcm_sf2.c +2
-6priv->slave_mii_bus->phy_mask = ~priv->indir_phy_mask; -if (dn) - err =of_mdiobus_register (priv->slave_mii_bus, dn); -else - err =mdiobus_register (priv->slave_mii_bus); - -if (err) + err =of_mdiobus_register (priv->slave_mii_bus, dn); +if (err && dn)
of_node_put() checks for NULL.
Quoted 3 lines
drivers/net/dsa/bcm_sf2.c +0
-0of_node_put (dn);return err;
[...]
drivers/net/ethernet/freescale/fec_main.c static int fec_enet_mii_init(struct platform_device *pdev) · line 2057
Quoted 13 lines
drivers/net/ethernet/freescale/fec_main.c +2
-2@@ -2052,13 +2052,9 @@ static int fec_enet_mii_init(struct platform_device *pdev) fep->mii_bus->parent = &pdev->dev; node =of_get_child_by_name (pdev->dev.of_node,"mdio" ); -if (node) { - err =of_mdiobus_register (fep->mii_bus, node); + err =of_mdiobus_register (fep->mii_bus, node); +if (node)of_node_put (node);
Same comment here.
[...]
Quoted 13 lines
drivers/net/ethernet/renesas/sh_eth.c +0
-5@@ -3025,15 +3025,10 @@ static int sh_mdio_init(struct sh_eth_private *mdp, pdev->name, pdev->id);/* register MDIO bus */ -if (dev->of_node) { - ret =of_mdiobus_register (mdp->mii_bus, dev->of_node); - }else { -if (pd->phy_irq >0 ) - mdp->mii_bus->irq[pd->phy] = pd->phy_irq;
drivers/net/ethernet/renesas/sh_eth.c static int sh_mdio_init(struct sh_eth_private *mdp, · line 3034
Quoted 10 lines
drivers/net/ethernet/renesas/sh_eth.c +3
-3- - ret =mdiobus_register (mdp->mii_bus); - } +if (pd->phy_irq >0 ) + mdp->mii_bus->irq[pd->phy] = pd->phy_irq; + ret =of_mdiobus_register (mdp->mii_bus, dev->of_node);if (ret) goto out_free_bus;
This part is:
[...]
drivers/net/usb/lan78xx.c static int lan78xx_mdio_init(struct lan78xx_net *dev) · line 1848
Quoted 13 lines
drivers/net/usb/lan78xx.c +2
-2@@ -1843,12 +1843,9 @@ static int lan78xx_mdio_init(struct lan78xx_net *dev) } node =of_get_child_by_name (dev->udev->dev.of_node,"mdio" ); -if (node) { - ret =of_mdiobus_register (dev->mdiobus, node); + ret =of_mdiobus_register (dev->mdiobus, node); +if (node)of_node_put (node);
of_node_put() checks for NULL, again...
MBR, Sergei
Hi Florian,
Thanks for your series!
I like the effect on simplifying drivers.
Quoted 3 lines · Florian Fainelli
This patch series updates
of_mdiobus_register()such that when thedevice_nodeargument is NULL, it callsmdiobus_register()directly. This is consistent with the behavior ofof_mdiobus_register()whenCONFIG_OF=n.
IMHO the CONFIG_OF=n behavior of of_mdiobus_register() (which I wasn't aware of) is inconsistent with the behavior of other of_*() functions, which are just empty stubs.
So I'm wondering if you should do it the other way around, and let mdiobus_register() call of_mdiobus_register() if dev->of_node exists?
This does mean mdiobus_register() should gain a struct device * parameter, and thus changes to many more drivers are needed.
Quoted 2 lines
I only converted the most obvious drivers, there are others that have a much less obvious behavior and specifically attempt to deal with
CONFIG_ACPI.
I haven't looked at the ACPI handling, but perhaps this can be moved inside mdiobus_register() as well?
Gr{oetje,eeting}s,
Geert
Signature · 5 lines
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected] In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
Andrew Lunn
maintainerQuoted 10 lines · Geert Uytterhoeven
Hi Florian,
Thanks for your series!
I like the effect on simplifying drivers.Quoted 3 lines · Florian Fainelli
This patch series updates
of_mdiobus_register()such that when thedevice_nodeargument is NULL, it callsmdiobus_register()directly. This is consistent with the behavior ofof_mdiobus_register()whenCONFIG_OF=n.
Quoted 6 lines
IMHO the
CONFIG_OF=nbehavior ofof_mdiobus_register()(which I wasn't aware of) is inconsistent with the behavior of other of_*() functions, which are just empty stubs.So I'm wondering if you should do it the other way around, and let
mdiobus_register()callof_mdiobus_register()ifdev->of_nodeexists?
Hi Geert
dev->of_node is often not the correct OF node. The mdio properties are often embedded inside a MAC driver, and use an 'mdio' container node. This container node is needed, not the device node.
Quoted 2 lines
I haven't looked at the ACPI handling, but perhaps this can be moved inside
mdiobus_register()as well?
The ACPI binding for MDIO and PHYs has not been defined yet.
Andrew
David Miller
maintainerFrom: Florian Fainelli <[email protected]>
Date: Tue, 15 May 2018 16:56:17 -0700
Quoted 4 lines
This patch series updates
of_mdiobus_register()such that when thedevice_nodeargument is NULL, it callsmdiobus_register()directly. This is consistent with the behavior ofof_mdiobus_register()whenCONFIG_OF=n.
Quoted 8 lines
I only converted the most obvious drivers, there are others that have a much less obvious behavior and specifically attempt to deal with
CONFIG_ACPI.Changes in v2:
- fixed build error in
davincin_mdio.c(Grygorii)
- reworked first patch a bit: commit message, subject and removed useless code comment
Based upon Andrew's response to Geert's feedback, I'm applying this series.
Thanks.
Hi David,
Quoted 10 lines · David Miller
From: Florian Fainelli <[email protected]>
Date: Tue, 15 May 2018 16:56:17 -0700Quoted 7 lines
This patch series updates
of_mdiobus_register()such that when thedevice_nodeargument is NULL, it callsmdiobus_register()directly. This is consistent with the behavior ofof_mdiobus_register()whenCONFIG_OF=n.I only converted the most obvious drivers, there are others that have a much less obvious behavior and specifically attempt to deal with
CONFIG_ACPI.
Quoted 7 lines
Quoted 5 lines
Changes in v2:
- fixed build error in
davincin_mdio.c(Grygorii)
- reworked first patch a bit: commit message, subject and removed useless code commentBased upon Andrew's response to Geert's feedback, I'm applying this series.
Thanks, his feedback made perfect sense.
Gr{oetje,eeting}s,
Geert
Signature · 5 lines
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected] In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds