diff mbox series

[U-Boot,v2,1/9] net: tsec: Refactor the readout of the tbi-handle property

Message ID 20190714001701.2781-2-olteanv@gmail.com
State Superseded
Delegated to: Joe Hershberger
Headers show
Series NXP LS1021A-TSN Board | expand

Commit Message

Vladimir Oltean July 14, 2019, 12:16 a.m. UTC 
The point of this patch is to eliminate the use of the locally-defined
"reg" variable (which interferes with next patch) and simplify the
fallback to the default CONFIG_SYS_TBIPA_VALUE in case "tbi-handle" is
missing.

Signed-off-by: Vladimir Oltean <olteanv@gmail.com>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
---
Changes from v1:

None.

 drivers/net/tsec.c | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)
diff mbox series

Patch

diff --git a/drivers/net/tsec.c b/drivers/net/tsec.c
index 06a9b4fb03ce..53eb5470f4c8 100644
--- a/drivers/net/tsec.c
+++ b/drivers/net/tsec.c
@@ -798,6 +798,7 @@  int tsec_probe(struct udevice *dev)
 	struct eth_pdata *pdata = dev_get_platdata(dev);
 	struct fsl_pq_mdio_info mdio_info;
 	struct ofnode_phandle_args phandle_args;
+	u32 tbiaddr = CONFIG_SYS_TBIPA_VALUE;
 	ofnode parent;
 	const char *phy_mode;
 	int ret;
@@ -825,14 +826,12 @@  int tsec_probe(struct udevice *dev)
 		return -ENOENT;
 	}
 
-	if (dev_read_phandle_with_args(dev, "tbi-handle", NULL, 0, 0,
-				       &phandle_args)) {
-		priv->tbiaddr = CONFIG_SYS_TBIPA_VALUE;
-	} else {
-		int reg = ofnode_read_u32_default(phandle_args.node, "reg",
-						  CONFIG_SYS_TBIPA_VALUE);
-		priv->tbiaddr = reg;
-	}
+	ret = dev_read_phandle_with_args(dev, "tbi-handle", NULL, 0, 0,
+					 &phandle_args);
+	if (ret == 0)
+		ofnode_read_u32(phandle_args.node, "reg", &tbiaddr);
+
+	priv->tbiaddr = tbiaddr;
 
 	phy_mode = dev_read_prop(dev, "phy-connection-type", NULL);
 	if (phy_mode)