of_mdio: use PTR_ERR_OR_ZERO()
authorSergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Sat, 12 Mar 2016 21:34:58 +0000 (00:34 +0300)
committerDavid S. Miller <davem@davemloft.net>
Mon, 14 Mar 2016 19:31:58 +0000 (15:31 -0400)
PTR_ERR_OR_ZERO() is open coded in of_phy_register_fixed_link(), so just
call it directly...

Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Reviewed-by: Vladimir Zapolskiy <vz@mleia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/of/of_mdio.c

index 52d9b14e17175b5f38709f441e036191400b772f..8453f08d2ef41b2c8c93596b5a825f24562f5ff2 100644 (file)
@@ -412,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);
                }
        }
 
@@ -434,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 */
@@ -446,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;