of: overlay: make all pr_debug() and pr_err() messages unique (a15e824f) · Commits · 戴 / test

drivers/of/overlay.c

+7 −5

Original line number	Diff line number	Diff line
		@@ -507,7 +507,7 @@ static int build_changeset_symbols_node(struct overlay_changeset *ovcs,
		for_each_property_of_node(overlay_symbols_node, prop) {
		ret = add_changeset_property(ovcs, target, prop, 1);
		if (ret) {
		pr_debug("Failed to apply prop @%pOF/%s, err=%d\n",
		pr_debug("Failed to apply symbols prop @%pOF/%s, err=%d\n",
		target->np, prop->name, ret);
		return ret;
		}
		@@ -551,7 +551,8 @@ static int build_changeset(struct overlay_changeset *ovcs)
		ret = build_changeset_next_level(ovcs, &target,
		fragment->overlay);
		if (ret) {
		pr_debug("apply failed '%pOF'\n", fragment->target);
		pr_debug("fragment apply failed '%pOF'\n",
		fragment->target);
		return ret;
		}
		}
		@@ -564,7 +565,8 @@ static int build_changeset(struct overlay_changeset *ovcs)
		ret = build_changeset_symbols_node(ovcs, &target,
		fragment->overlay);
		if (ret) {
		pr_debug("apply failed '%pOF'\n", fragment->target);
		pr_debug("symbols fragment apply failed '%pOF'\n",
		fragment->target);
		return ret;
		}
		}
		@@ -873,7 +875,7 @@ static int of_overlay_apply(const void fdt, struct device_node tree,

		ret = __of_changeset_apply_notify(&ovcs->cset);
		if (ret)
		pr_err("overlay changeset entry notify error %d\n", ret);
		pr_err("overlay apply changeset entry notify error %d\n", ret);
		/* notify failure is not fatal, continue */

		list_add_tail(&ovcs->ovcs_list, &ovcs_list);
		@@ -1132,7 +1134,7 @@ int of_overlay_remove(int *ovcs_id)

		ret = __of_changeset_revert_notify(&ovcs->cset);
		if (ret)
		pr_err("overlay changeset entry notify error %d\n", ret);
		pr_err("overlay remove changeset entry notify error %d\n", ret);
		/* notify failure is not fatal, continue */

		*ovcs_id = 0;

Admin message