Hello Sergei,
On 12.03.2016 00:13, Sergei Shtylyov wrote:
> 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@xxxxxxxxxxxxxxxxxx>
>
> ---
> drivers/of/of_mdio.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> Index: net-next/drivers/of/of_mdio.c
> ===================================================================
> --- net-next.orig/drivers/of/of_mdio.c
> +++ net-next/drivers/of/of_mdio.c
> @@ -412,7 +412,7 @@ int of_phy_register_fixed_link(struct de
> 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 de
> 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 de
> 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;
>
Reviewed-by: Vladimir Zapolskiy <vz@xxxxxxxxx>
--
With best wishes,
Vladimir
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
