hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

of: property: Minor style clean up of of_link_to_phandle() 

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 <saravanak@google.com>
Reviewed-by: Rob Herring <robh@kernel.org>
Link: https://lore.kernel.org/r/20191105065000.50407-2-saravanak@google.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Saravana Kannan 2019-11-04 22:49:58 -08:00 committed by Greg Kroah-Hartman
parent cc4c831811
commit ba861f8e07
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/of/property.c
View File

@ -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); sup_dev = get_dev_from_fwnode(&sup_np->fwnode);
is_populated = of_node_check_flag(sup_np, OF_POPULATED); is_populated = of_node_check_flag(sup_np, OF_POPULATED);
of_node_put(sup_np); of_node_put(sup_np);
if (!sup_dev) if (!sup_dev && is_populated) {
return is_populated ? 0 : -EAGAIN; /* 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)) if (!device_link_add(dev, sup_dev, dl_flags))
ret = -EAGAIN; ret = -EAGAIN;
put_device(sup_dev); put_device(sup_dev);