Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux

[cascardo/linux.git] / drivers / of / of_mdio.c

diff --git a/drivers/of/of_mdio.c b/drivers/of/of_mdio.c
index 365dc7e..8453f08 100644 (file)
--- a/drivers/of/of_mdio.c
+++ b/drivers/of/of_mdio.c
@@ -56,7 +56,7 @@ static int of_mdiobus_register_phy(struct mii_bus *mdio, struct device_node *chi
                phy = phy_device_create(mdio, addr, phy_id, 0, NULL);
        else
                phy = get_phy_device(mdio, addr, is_c45);
-       if (!phy || IS_ERR(phy))
+       if (IS_ERR_OR_NULL(phy))
                return 1;
 
        rc = irq_of_parse_and_map(child, 0);
@@ -98,7 +98,7 @@ static int of_mdiobus_register_device(struct mii_bus *mdio,
        int rc;
 
        mdiodev = mdio_device_create(mdio, addr);
-       if (!mdiodev || IS_ERR(mdiodev))
+       if (IS_ERR(mdiodev))
                return 1;
 
        /* Associate the OF node with the device structure so it
@@ -211,7 +211,6 @@ static bool of_mdiobus_child_is_phy(struct device_node *child)
 int of_mdiobus_register(struct mii_bus *mdio, struct device_node *np)
 {
        struct device_node *child;
-       const __be32 *paddr;
        bool scanphys = false;
        int addr, rc;
 
@@ -246,8 +245,7 @@ int of_mdiobus_register(struct mii_bus *mdio, struct device_node *np)
        /* auto scan for PHYs with empty reg property */
        for_each_available_child_of_node(np, child) {
                /* Skip PHYs with reg property set */
-               paddr = of_get_property(child, "reg", NULL);
-               if (paddr)
+               if (of_find_property(child, "reg", NULL))
                        continue;
 
                for (addr = 0; addr < PHY_MAX_ADDR; addr++) {
@@ -414,7 +412,7 @@ int of_phy_register_fixed_link(struct device_node *np)
                if (strcmp(managed, "in-band-status") == 0) {
                        /* status is zeroed, namely its .link member */
                        phy = fixed_phy_register(PHY_POLL, &status, -1, np);
-                       return IS_ERR(phy) ? PTR_ERR(phy) : 0;
+                       return PTR_ERR_OR_ZERO(phy);
                }
        }
 
@@ -436,7 +434,7 @@ int of_phy_register_fixed_link(struct device_node *np)
                        return -EPROBE_DEFER;
 
                phy = fixed_phy_register(PHY_POLL, &status, link_gpio, np);
-               return IS_ERR(phy) ? PTR_ERR(phy) : 0;
+               return PTR_ERR_OR_ZERO(phy);
        }
 
        /* Old binding */
@@ -448,7 +446,7 @@ int of_phy_register_fixed_link(struct device_node *np)
                status.pause = be32_to_cpu(fixed_link_prop[3]);
                status.asym_pause = be32_to_cpu(fixed_link_prop[4]);
                phy = fixed_phy_register(PHY_POLL, &status, -1, np);
-               return IS_ERR(phy) ? PTR_ERR(phy) : 0;
+               return PTR_ERR_OR_ZERO(phy);
        }
 
        return -ENODEV;