net: of_mdio: factor out code to parse a phy's 'reg' property

Factor out some logic into of_mdio_parse_addr() so it can be reused
later. While at it, use of_property_read_u32() rather than open-coding
the same logic again.

Signed-off-by: Daniel Mack <zonque@gmail.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 23 insertions, 12 deletions

diff --git a/drivers/of/of_mdio.c b/drivers/of/of_mdio.c
index 7c6e277cdd1f..731d3d9052d7 100644
--- a/drivers/of/of_mdio.c
+++ b/drivers/of/of_mdio.c
@@ -88,6 +88,27 @@ static int of_mdiobus_register_phy(struct mii_bus *mdio, struct device_node *chi
         return 0;
 }
 
+static int of_mdio_parse_addr(struct device *dev, const struct device_node *np)
+{
+        u32 addr;
+        int ret;
+
+        ret = of_property_read_u32(np, "reg", &addr);
+        if (ret < 0) {
+                dev_err(dev, "%s has invalid PHY address\n", np->full_name);
+                return ret;
+        }
+
+        /* A PHY must have a reg property in the range [0-31] */
+        if (addr >= PHY_MAX_ADDR) {
+                dev_err(dev, "%s PHY address %i is too large\n",
+                        np->full_name, addr);
+                return -EINVAL;
+        }
+
+        return addr;
+}
+
 /**
  * of_mdiobus_register - Register mii_bus and create PHYs from the device tree
  * @mdio: pointer to mii_bus structure
@@ -122,19 +143,9 @@ int of_mdiobus_register(struct mii_bus *mdio, struct device_node *np)
 
         /* Loop over the child nodes and register a phy_device for each one */
         for_each_available_child_of_node(np, child) {
-                /* A PHY must have a reg property in the range [0-31] */
-                paddr = of_get_property(child, "reg", &len);
-                if (!paddr || len < sizeof(*paddr)) {
+                addr = of_mdio_parse_addr(&mdio->dev, child);
+                if (addr < 0) {
                         scanphys = true;
-                        dev_err(&mdio->dev, "%s has invalid PHY address\n",
-                                child->full_name);
-                        continue;
-                }
-
-                addr = be32_to_cpup(paddr);
-                if (addr >= PHY_MAX_ADDR) {
-                        dev_err(&mdio->dev, "%s PHY address %i is too large\n",
-                                child->full_name, addr);
                         continue;
                 }