[PATCH] net: mdio: Remove redundant parameter and check

[PATCH] net: mdio: Remove redundant parameter and check

[Tang Bin]

In the function ipq8064_mdio_probe(), of_mdiobus_register() might
returned zero, so the direct return can simplify code. Thus remove
redundant parameter and check.

Signed-off-by: Zhang Shengju <zhangshengju@cmss.chinamobile.com>
Signed-off-by: Tang Bin <tangbin@cmss.chinamobile.com>
---
 drivers/net/mdio/mdio-ipq8064.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/drivers/net/mdio/mdio-ipq8064.c b/drivers/net/mdio/mdio-ipq8064.c
index 1bd1885..33cccce 100644
--- a/drivers/net/mdio/mdio-ipq8064.c
+++ b/drivers/net/mdio/mdio-ipq8064.c
@@ -102,7 +102,6 @@ ipq8064_mdio_probe(struct platform_device *pdev)
 	struct device_node *np = pdev->dev.of_node;
 	struct ipq8064_mdio *priv;
 	struct mii_bus *bus;
-	int ret;
 
 	bus = devm_mdiobus_alloc_size(&pdev->dev, sizeof(*priv));
 	if (!bus)
@@ -125,12 +124,9 @@ ipq8064_mdio_probe(struct platform_device *pdev)
 		return PTR_ERR(priv->base);
 	}
 
-	ret = of_mdiobus_register(bus, np);
-	if (ret)
-		return ret;
-
 	platform_set_drvdata(pdev, bus);
-	return 0;
+
+	return of_mdiobus_register(bus, np);
 }
 
 static int
-- 
2.20.1.windows.1

Re: [PATCH] net: mdio: Remove redundant parameter and check

[Heiner Kallweit]

On 23.09.2020 12:05, Tang Bin wrote:
> In the function ipq8064_mdio_probe(), of_mdiobus_register() might
> returned zero, so the direct return can simplify code. Thus remove
> redundant parameter and check.
> 
> Signed-off-by: Zhang Shengju <zhangshengju@cmss.chinamobile.com>
> Signed-off-by: Tang Bin <tangbin@cmss.chinamobile.com>
> ---
>  drivers/net/mdio/mdio-ipq8064.c | 8 ++------
>  1 file changed, 2 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/net/mdio/mdio-ipq8064.c b/drivers/net/mdio/mdio-ipq8064.c
> index 1bd1885..33cccce 100644
> --- a/drivers/net/mdio/mdio-ipq8064.c
> +++ b/drivers/net/mdio/mdio-ipq8064.c
> @@ -102,7 +102,6 @@ ipq8064_mdio_probe(struct platform_device *pdev)
>  	struct device_node *np = pdev->dev.of_node;
>  	struct ipq8064_mdio *priv;
>  	struct mii_bus *bus;
> -	int ret;
>  
>  	bus = devm_mdiobus_alloc_size(&pdev->dev, sizeof(*priv));
>  	if (!bus)
> @@ -125,12 +124,9 @@ ipq8064_mdio_probe(struct platform_device *pdev)
>  		return PTR_ERR(priv->base);
>  	}
>  
> -	ret = of_mdiobus_register(bus, np);
> -	if (ret)
> -		return ret;
> -
>  	platform_set_drvdata(pdev, bus);

Before your patch this is called only after of_mdiobus_register()
returns successfully. Now it's called unconditionally before.
Are you sure this can't have a side effect?

> -	return 0;
> +
> +	return of_mdiobus_register(bus, np);
>  }
>  
>  static int
> 

Re: [PATCH] net: mdio: Remove redundant parameter and check

[David Miller]

From: Tang Bin <tangbin@cmss.chinamobile.com>
Date: Wed, 23 Sep 2020 18:05:32 +0800

> @@ -125,12 +124,9 @@ ipq8064_mdio_probe(struct platform_device *pdev)
>  		return PTR_ERR(priv->base);
>  	}
>  
> -	ret = of_mdiobus_register(bus, np);
> -	if (ret)
> -		return ret;
> -
>  	platform_set_drvdata(pdev, bus);
> -	return 0;
> +
> +	return of_mdiobus_register(bus, np);
>  }

You are changing the code rather than simplifying the return sequence.

The author of this code intended the platform_set_drvdata() to only
happen if all operations of this function succeeded.

I am not applying this patch, sorry.