Skip to content

Commit 1e36ba1

Browse files
ffainelliclaudiubeznea
authored andcommitted
drivers: net: Remove device_node checks with of_mdiobus_register()
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 <f.fainelli@gmail.com> Reviewed-by: Grygorii Strashko <grygorii.strashko@ti.com> Reviewed-by: Fugang Duan <fugang.duan@nxp.com> Reviewed-by: Antoine Tenart <antoine.tenart@bootlin.com> Reviewed-by: Jose Abreu <joabreu@synopsys.com> Signed-off-by: David S. Miller <davem@davemloft.net>
1 parent 8603fcc commit 1e36ba1

1 file changed

Lines changed: 3 additions & 9 deletions

File tree

drivers/net/ethernet/cadence/macb_main.c

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -591,16 +591,10 @@ static int macb_mii_init(struct macb *bp)
591591
dev_set_drvdata(&bp->dev->dev, bp->mii_bus);
592592

593593
np = bp->pdev->dev.of_node;
594+
if (pdata)
595+
bp->mii_bus->phy_mask = pdata->phy_mask;
594596

595-
if (np) {
596-
err = of_mdiobus_register(bp->mii_bus, np);
597-
} else {
598-
if (pdata)
599-
bp->mii_bus->phy_mask = pdata->phy_mask;
600-
601-
err = mdiobus_register(bp->mii_bus);
602-
}
603-
597+
err = of_mdiobus_register(bp->mii_bus, np);
604598
if (err)
605599
goto err_out_free_mdiobus;
606600

0 commit comments

Comments
 (0)