diff options
| author | Ahmad Fatoum <a.fatoum@pengutronix.de> | 2022-02-07 09:28:00 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2022-02-07 09:35:41 +0100 |
| commit | 66715eb4e93e94b47fca865f9190c51b8fe218d7 (patch) | |
| tree | cfcf5372114016e3a43e120258cb7ab4d1a2f0ec | |
| parent | cfa1e13fba762f3be4d193523ddcc7ea76018c53 (diff) | |
| download | barebox-66715eb4e93e94b47fca865f9190c51b8fe218d7.tar.gz barebox-66715eb4e93e94b47fca865f9190c51b8fe218d7.tar.xz | |
of: silence of_diff output for negative indents
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 <a.fatoum@pengutronix.de>
Link: https://lore.barebox.org/20220207082801.1052894-4-a.fatoum@pengutronix.de
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| -rw-r--r-- | drivers/of/base.c | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/drivers/of/base.c b/drivers/of/base.c index 99be242542..51984d7d8f 100644 --- a/drivers/of/base.c +++ b/drivers/of/base.c @@ -2082,11 +2082,14 @@ int of_diff(struct device_node *a, struct device_node *b, int indent) struct property *ap, *bp; struct device_node *ca, *cb; int printed = 0, diff = 0; + bool silent = indent < 0; list_for_each_entry(ap, &a->properties, list) { bp = of_find_property(b, ap->name, NULL); if (!bp) { diff++; + if (silent) + continue; of_print_parents(a, &printed); printf("- "); __of_print_property(ap, indent); @@ -2095,6 +2098,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 (silent) + continue; of_print_parents(a, &printed); printf("- "); __of_print_property(ap, indent); @@ -2107,6 +2112,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 (silent) + continue; of_print_parents(a, &printed); printf("+ "); __of_print_property(bp, indent); @@ -2116,9 +2123,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, silent ? indent : indent + 1); } else { diff++; + if (silent) + continue; of_print_parents(a, &printed); __of_print_nodes(ca, indent, "- "); } @@ -2127,12 +2136,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 (silent) + continue; of_print_parents(a, &printed); __of_print_nodes(cb, indent, "+ "); } } - of_print_close(a, &printed); + if (!silent) + of_print_close(a, &printed); return diff; } |