[PATCH v1 1/3] of: property: Minor style clean up of of_link_to_phandle()
DORMANTno replies
From: Saravana Kannan <hidden>
Date: 2019-11-05 06:45:06
Also in:
lkml
Subsystem:
open firmware and flattened device tree, the rest · Maintainers:
Rob Herring, Saravana Kannan, Linus Torvalds
Possibly related (same subject, not in this thread)
- 2019-11-07 · Re: [PATCH v1 1/3] of: property: Minor style clean up of of_link_to_phandle() · Rob Herring <robh@kernel.org>
- 2019-11-05 · [PATCH v1 1/3] of: property: Minor style clean up of of_link_to_phandle() · Saravana Kannan <hidden>
Adding a debug log instead of silently ignoring a phandle for an early device. Also, return the right error code instead of 0 even though the actual execution flow won't change. Signed-off-by: Saravana Kannan <redacted> --- drivers/of/property.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/drivers/of/property.c b/drivers/of/property.c
index e225ab17f598..fbc201330ba0 100644
--- a/drivers/of/property.c
+++ b/drivers/of/property.c@@ -1051,8 +1051,14 @@ static int of_link_to_phandle(struct device *dev, struct device_node *sup_np, sup_dev = get_dev_from_fwnode(&sup_np->fwnode); is_populated = of_node_check_flag(sup_np, OF_POPULATED); of_node_put(sup_np); - if (!sup_dev) - return is_populated ? 0 : -EAGAIN; + if (!sup_dev && is_populated) { + /* Early device without struct device. */ + dev_dbg(dev, "Not linking to %pOFP - No struct device\n", + sup_np); + return -ENODEV; + } else if (!sup_dev) { + return -EAGAIN; + } if (!device_link_add(dev, sup_dev, dl_flags)) ret = -EAGAIN; put_device(sup_dev);
--
2.24.0.rc1.363.gb1bccd3e3d-goog