Negative indents just led to strange behavior so far. Repurpose them to mean that the caller is not interested in console output. This makes them useful for negative tests (Sanity check that two different nodes are indeed different).
Signed-off-by: Ahmad Fatoum <[email protected]> --- drivers/of/base.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/drivers/of/base.c b/drivers/of/base.c index 99be24254203..ffa79785f80e 100644 --- a/drivers/of/base.c +++ b/drivers/of/base.c @@ -2087,6 +2087,8 @@ int of_diff(struct device_node *a, struct device_node *b, int indent) bp = of_find_property(b, ap->name, NULL); if (!bp) { diff++; + if (indent < 0) + continue; of_print_parents(a, &printed); printf("- "); __of_print_property(ap, indent); @@ -2095,6 +2097,8 @@ int of_diff(struct device_node *a, struct device_node *b, int indent) if (ap->length != bp->length || memcmp(of_property_get_value(ap), of_property_get_value(bp), bp->length)) { diff++; + if (indent < 0) + continue; of_print_parents(a, &printed); printf("- "); __of_print_property(ap, indent); @@ -2107,6 +2111,8 @@ int of_diff(struct device_node *a, struct device_node *b, int indent) ap = of_find_property(a, bp->name, NULL); if (!ap) { diff++; + if (indent < 0) + continue; of_print_parents(a, &printed); printf("+ "); __of_print_property(bp, indent); @@ -2116,9 +2122,11 @@ int of_diff(struct device_node *a, struct device_node *b, int indent) for_each_child_of_node(a, ca) { cb = of_get_child_by_name(b, ca->name); if (cb) { - diff += of_diff(ca, cb, indent + 1); + diff += of_diff(ca, cb, indent >= 0 ? indent + 1 : indent); } else { diff++; + if (indent < 0) + continue; of_print_parents(a, &printed); __of_print_nodes(ca, indent, "- "); } @@ -2127,12 +2135,15 @@ int of_diff(struct device_node *a, struct device_node *b, int indent) for_each_child_of_node(b, cb) { if (!of_get_child_by_name(a, cb->name)) { diff++; + if (indent < 0) + continue; of_print_parents(a, &printed); __of_print_nodes(cb, indent, "+ "); } } - of_print_close(a, &printed); + if (indent >= 0) + of_print_close(a, &printed); return diff; } -- 2.30.2 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
