aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrank Rowand <frank.rowand@sony.com>2018-10-04 23:33:35 -0400
committerFrank Rowand <frank.rowand@sony.com>2018-11-09 01:11:39 -0500
commita15e824ff2c18b2bb2464227009ae6aac4f07e10 (patch)
tree5139dbcae861b20339b2a82ffa146e1bf57a55fc
parent6f75118800acf77f8ad6afec61ca1b2349ade371 (diff)
of: overlay: make all pr_debug() and pr_err() messages unique
Make overlay.c debug and error messages unique so that they can be unambiguously found by grep. Tested-by: Alan Tull <atull@kernel.org> Signed-off-by: Frank Rowand <frank.rowand@sony.com>
-rw-r--r--drivers/of/overlay.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/drivers/of/overlay.c b/drivers/of/overlay.c
index 72bf00adb9c8..c8f88b0836a3 100644
--- a/drivers/of/overlay.c
+++ b/drivers/of/overlay.c
@@ -507,7 +507,7 @@ static int build_changeset_symbols_node(struct overlay_changeset *ovcs,
507 for_each_property_of_node(overlay_symbols_node, prop) { 507 for_each_property_of_node(overlay_symbols_node, prop) {
508 ret = add_changeset_property(ovcs, target, prop, 1); 508 ret = add_changeset_property(ovcs, target, prop, 1);
509 if (ret) { 509 if (ret) {
510 pr_debug("Failed to apply prop @%pOF/%s, err=%d\n", 510 pr_debug("Failed to apply symbols prop @%pOF/%s, err=%d\n",
511 target->np, prop->name, ret); 511 target->np, prop->name, ret);
512 return ret; 512 return ret;
513 } 513 }
@@ -551,7 +551,8 @@ static int build_changeset(struct overlay_changeset *ovcs)
551 ret = build_changeset_next_level(ovcs, &target, 551 ret = build_changeset_next_level(ovcs, &target,
552 fragment->overlay); 552 fragment->overlay);
553 if (ret) { 553 if (ret) {
554 pr_debug("apply failed '%pOF'\n", fragment->target); 554 pr_debug("fragment apply failed '%pOF'\n",
555 fragment->target);
555 return ret; 556 return ret;
556 } 557 }
557 } 558 }
@@ -564,7 +565,8 @@ static int build_changeset(struct overlay_changeset *ovcs)
564 ret = build_changeset_symbols_node(ovcs, &target, 565 ret = build_changeset_symbols_node(ovcs, &target,
565 fragment->overlay); 566 fragment->overlay);
566 if (ret) { 567 if (ret) {
567 pr_debug("apply failed '%pOF'\n", fragment->target); 568 pr_debug("symbols fragment apply failed '%pOF'\n",
569 fragment->target);
568 return ret; 570 return ret;
569 } 571 }
570 } 572 }
@@ -873,7 +875,7 @@ static int of_overlay_apply(const void *fdt, struct device_node *tree,
873 875
874 ret = __of_changeset_apply_notify(&ovcs->cset); 876 ret = __of_changeset_apply_notify(&ovcs->cset);
875 if (ret) 877 if (ret)
876 pr_err("overlay changeset entry notify error %d\n", ret); 878 pr_err("overlay apply changeset entry notify error %d\n", ret);
877 /* notify failure is not fatal, continue */ 879 /* notify failure is not fatal, continue */
878 880
879 list_add_tail(&ovcs->ovcs_list, &ovcs_list); 881 list_add_tail(&ovcs->ovcs_list, &ovcs_list);
@@ -1132,7 +1134,7 @@ int of_overlay_remove(int *ovcs_id)
1132 1134
1133 ret = __of_changeset_revert_notify(&ovcs->cset); 1135 ret = __of_changeset_revert_notify(&ovcs->cset);
1134 if (ret) 1136 if (ret)
1135 pr_err("overlay changeset entry notify error %d\n", ret); 1137 pr_err("overlay remove changeset entry notify error %d\n", ret);
1136 /* notify failure is not fatal, continue */ 1138 /* notify failure is not fatal, continue */
1137 1139
1138 *ovcs_id = 0; 1140 *ovcs_id = 0;