summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVladimir Oltean <olteanv@gmail.com>2019-07-19 00:29:53 +0300
committerJoe Hershberger <joe.hershberger@ni.com>2019-07-25 13:13:30 -0500
commit29db3107a526ecd795eb236e345434bf1fa3d0d4 (patch)
tree7fc8d2f329bb0f2c332d77c3355ba01bdd078aab
parentc6d07bf440bcfd39c1c61c1cd7c8ef3b059c5669 (diff)
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>
-rw-r--r--drivers/net/tsec.c15
1 files changed, 7 insertions, 8 deletions
diff --git a/drivers/net/tsec.c b/drivers/net/tsec.c
index 06a9b4fb03..53eb5470f4 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)