diff mbox series

[2/6] net: dsa: use "err" instead of "ret" in dsa_port_probe

Message ID 20210629170839.2583797-3-olteanv@gmail.com
State Changes Requested
Delegated to: Priyanka Jain
Headers show
Series Call phy_config at port probe time for the Felix DSA driver | expand

Commit Message

Vladimir Oltean June 29, 2021, 5:08 p.m. UTC 
From: Vladimir Oltean <vladimir.oltean@nxp.com>

DM DSA uses "err" for error code values, so use this consistently.

Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
---
 net/dsa-uclass.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Comments

Ramon Fried June 29, 2021, 10:16 p.m. UTC | #1 
On Tue, Jun 29, 2021 at 8:09 PM Vladimir Oltean <olteanv@gmail.com> wrote:
>
> From: Vladimir Oltean <vladimir.oltean@nxp.com>
>
> DM DSA uses "err" for error code values, so use this consistently.
>
> Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
> ---
>  net/dsa-uclass.c | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/net/dsa-uclass.c b/net/dsa-uclass.c
> index 7ea1cb6949c0..17b33834f585 100644
> --- a/net/dsa-uclass.c
> +++ b/net/dsa-uclass.c
> @@ -248,7 +248,7 @@ static int dsa_port_probe(struct udevice *pdev)
>         struct dsa_port_pdata *port_pdata;
>         struct dsa_priv *dsa_priv;
>         struct udevice *master;
> -       int ret;
> +       int err;
>
>         port_pdata = dev_get_parent_plat(pdev);
>         dsa_priv = dev_get_uclass_priv(dev);
> @@ -268,9 +268,9 @@ static int dsa_port_probe(struct udevice *pdev)
>          * TODO: we assume the master device is always there and doesn't get
>          * removed during runtime.
>          */
> -       ret = device_probe(master);
> -       if (ret)
> -               return ret;
> +       err = device_probe(master);
> +       if (err)
> +               return err;
>
>         /*
>          * Inherit port's hwaddr from the DSA master, unless the port already
> --
> 2.25.1
>
Reviewed-by: Ramon Fried <rfried.dev@gmail.com>
diff mbox series

Patch

diff --git a/net/dsa-uclass.c b/net/dsa-uclass.c
index 7ea1cb6949c0..17b33834f585 100644
--- a/net/dsa-uclass.c
+++ b/net/dsa-uclass.c
@@ -248,7 +248,7 @@  static int dsa_port_probe(struct udevice *pdev)
 	struct dsa_port_pdata *port_pdata;
 	struct dsa_priv *dsa_priv;
 	struct udevice *master;
-	int ret;
+	int err;
 
 	port_pdata = dev_get_parent_plat(pdev);
 	dsa_priv = dev_get_uclass_priv(dev);
@@ -268,9 +268,9 @@  static int dsa_port_probe(struct udevice *pdev)
 	 * TODO: we assume the master device is always there and doesn't get
 	 * removed during runtime.
 	 */
-	ret = device_probe(master);
-	if (ret)
-		return ret;
+	err = device_probe(master);
+	if (err)
+		return err;
 
 	/*
 	 * Inherit port's hwaddr from the DSA master, unless the port already