From: Vladimir Oltean <vladimir.oltean@nxp.com>
Date: Tue, 24 Aug 2021 12:00:39 +0000 (+0300)
Subject: net: dsa: use "err" instead of "ret" in dsa_port_probe
X-Git-Tag: baikal/mips/sdk5.9~15^2^2~102^2~6^2~39
X-Git-Url: https://git.baikalelectronics.ru/sdk/?a=commitdiff_plain;h=d2a31d955e847d56aee09bd7aa31b85bf4b352e7;p=uboot.git

net: dsa: use "err" instead of "ret" in dsa_port_probe

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

Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Reviewed-by: Ramon Fried <rfried.dev@gmail.com>
Tested-by: Michael Walle <michael@walle.cc>
---

diff --git a/net/dsa-uclass.c b/net/dsa-uclass.c
index 694664d81b..f279ca7d2d 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