[PATCH 0/2] of_mdio: use IS_ERR_OR_NULL() and PTR_ERR_OR_ZERO()

[PATCH 0/2] of_mdio: use IS_ERR_OR_NULL() and PTR_ERR_OR_ZERO()

[Sergei Shtylyov]

Hello.

   Here's the set of 2 patches against DaveM's 'net-next.git' repo. They
replace the patch posted earlier today which was clearly insufficient...

[1/2] of_mdio: use IS_ERR_OR_NULL()
[2/2] of_mdio: use PTR_ERR_OR_ZERO()

MBR, Sergei

[PATCH 1/2] of_mdio: use IS_ERR_OR_NULL()

[Sergei Shtylyov]

IS_ERR_OR_NULL() is open coded in of_mdiobus_register_{phy|device}(), so
just call it directly...

Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>

---
 drivers/of/of_mdio.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Index: net-next/drivers/of/of_mdio.c
===================================================================
--- net-next.orig/drivers/of/of_mdio.c
+++ net-next/drivers/of/of_mdio.c
@@ -56,7 +56,7 @@ static int of_mdiobus_register_phy(struc
 		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(st
 	int rc;
 
 	mdiodev = mdio_device_create(mdio, addr);
-	if (!mdiodev || IS_ERR(mdiodev))
+	if (IS_ERR_OR_NULL(mdiodev))
 		return 1;
 
 	/* Associate the OF node with the device structure so it

[PATCH 2/2] of_mdio: use PTR_ERR_OR_ZERO()

[Sergei Shtylyov]

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>

---
 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;

Re: [PATCH 1/2] of_mdio: use IS_ERR_OR_NULL()

[Florian Fainelli]

On 11/03/16 14:12, Sergei Shtylyov wrote:
> IS_ERR_OR_NULL() is open coded in of_mdiobus_register_{phy|device}(), so
> just call it directly...
> 
> Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>

Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
-- 
Florian

Re: [PATCH 2/2] of_mdio: use PTR_ERR_OR_ZERO()

[Florian Fainelli]

On 11/03/16 14: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@cogentembedded.com>

Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
-- 
Florian

Re: [PATCH 1/2] of_mdio: use IS_ERR_OR_NULL()

[Vladimir Zapolskiy]

Hello Sergei,

On 12.03.2016 00:12, Sergei Shtylyov wrote:
> IS_ERR_OR_NULL() is open coded in of_mdiobus_register_{phy|device}(), so
> just call it directly...
> 
> Signed-off-by: Sergei Shtylyov <sergei.shtylyov-M4DtvfQ/ZS1MRgGoP+s0PdBPR1lH4CV8@public.gmane.org>
> 
> ---
>  drivers/of/of_mdio.c |    4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> Index: net-next/drivers/of/of_mdio.c
> ===================================================================
> --- net-next.orig/drivers/of/of_mdio.c
> +++ net-next/drivers/of/of_mdio.c
> @@ -56,7 +56,7 @@ static int of_mdiobus_register_phy(struc
>  		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(st
>  	int rc;
>  
>  	mdiodev = mdio_device_create(mdio, addr);
> -	if (!mdiodev || IS_ERR(mdiodev))
> +	if (IS_ERR_OR_NULL(mdiodev))
>  		return 1;
>  

I don't see how it is possible for mdio_device_create() to return NULL,
instead of this change consider to remove if (!mdiodev) check.

>  	/* Associate the OF node with the device structure so it
> 

--
With best wishes,
Vladimir
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 2/2] of_mdio: use PTR_ERR_OR_ZERO()

[Vladimir Zapolskiy]

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@cogentembedded.com>
> 
> ---
>  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@mleia.com>

Re: [PATCH 1/2] of_mdio: use IS_ERR_OR_NULL()

[Florian Fainelli]

On 11/03/16 14:53, Vladimir Zapolskiy wrote:
> Hello Sergei,
> 
> On 12.03.2016 00:12, Sergei Shtylyov wrote:
>> IS_ERR_OR_NULL() is open coded in of_mdiobus_register_{phy|device}(), so
>> just call it directly...
>>
>> Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
>>
>> ---
>>  drivers/of/of_mdio.c |    4 ++--
>>  1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> Index: net-next/drivers/of/of_mdio.c
>> ===================================================================
>> --- net-next.orig/drivers/of/of_mdio.c
>> +++ net-next/drivers/of/of_mdio.c
>> @@ -56,7 +56,7 @@ static int of_mdiobus_register_phy(struc
>>  		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(st
>>  	int rc;
>>  
>>  	mdiodev = mdio_device_create(mdio, addr);
>> -	if (!mdiodev || IS_ERR(mdiodev))
>> +	if (IS_ERR_OR_NULL(mdiodev))
>>  		return 1;
>>  
> 
> I don't see how it is possible for mdio_device_create() to return NULL,
> instead of this change consider to remove if (!mdiodev) check.

Good point, worst case we return PTR_ERR(-ENOMEM).
-- 
Florian