diff options
| author | Jon Mason <jon.mason@broadcom.com> | 2017-05-31 15:43:30 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-06-02 14:22:31 -0400 |
| commit | d0a65400eba812e86aa5676524dad09af3292f5a (patch) | |
| tree | 681c70b84a088d629eace7a7ccee6dd95ad9e7af | |
| parent | 775e68a93fe4d33ec93949c8022ed84b97a97096 (diff) | |
| download | linux-stable-d0a65400eba812e86aa5676524dad09af3292f5a.tar.gz linux-stable-d0a65400eba812e86aa5676524dad09af3292f5a.tar.bz2 linux-stable-d0a65400eba812e86aa5676524dad09af3292f5a.zip | |
net: phy: use of_mdio_parse_addr
use of_mdio_parse_addr() in place of an OF read of reg and a bounds
check (which is litterally the exact same thing that
of_mdio_parse_addr() does)
Signed-off-by: Jon Mason <jon.mason@broadcom.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/phy/mdio_bus.c | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/drivers/net/phy/mdio_bus.c b/drivers/net/phy/mdio_bus.c index 8e73f5f36e71..d4782e902e2e 100644 --- a/drivers/net/phy/mdio_bus.c +++ b/drivers/net/phy/mdio_bus.c @@ -263,21 +263,10 @@ static void of_mdiobus_link_mdiodev(struct mii_bus *bus, for_each_available_child_of_node(bus->dev.of_node, child) { int addr; - int ret; - ret = of_property_read_u32(child, "reg", &addr); - if (ret < 0) { - dev_err(dev, "%s has invalid MDIO address\n", - child->full_name); + addr = of_mdio_parse_addr(dev, child); + if (addr < 0) continue; - } - - /* A MDIO device must have a reg property in the range [0-31] */ - if (addr >= PHY_MAX_ADDR) { - dev_err(dev, "%s MDIO address %i is too large\n", - child->full_name, addr); - continue; - } if (addr == mdiodev->addr) { dev->of_node = child; |