net: tsec: Refactor the readout of the tbi-handle property

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>

diff --git a/drivers/net/tsec.c b/drivers/net/tsec.c
index 06a9b4fb03cefeedc0bb0d4e78cc8a5065019983..53eb5470f4c898fdef54ac95608be57d65875e2d 100644 (file)
--- 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)