xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

of: use pr_fmt prefix for all console printing

Browse Source 
Clean-up all the DT printk functions to use common pr_fmt prefix.

Some print statements such as kmalloc errors were redundant, so just
drop those.

Cc: Frank Rowand <frowand.list@gmail.com>
Cc: Pantelis Antoniou <pantelis.antoniou@konsulko.com>
Reviewed-by: Frank Rowand <frank.rowand@am.sony.com>
Signed-off-by: Rob Herring <robh@kernel.org>
This commit is contained in:
Rob Herring
2016-06-15 08:32:18 -05:00
parent 15cc2ed6dc
commit 606ad42aa3
11 changed files with 124 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
drivers/of/overlay.c
View File

@@ -8,7 +8,9 @@
* modify it under the terms of the GNU General Public License
* version 2 as published by the Free Software Foundation.
*/
#undef DEBUG
#define pr_fmt(fmt) "OF: overlay: " fmt
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/of.h>
@@ -137,8 +139,8 @@ static int of_overlay_apply_one(struct of_overlay *ov,
for_each_property_of_node(overlay, prop) {
ret = of_overlay_apply_single_property(ov, target, prop);
if (ret) {
pr_err("%s: Failed to apply prop @%s/%s\n",
__func__, target->full_name, prop->name);
pr_err("Failed to apply prop @%s/%s\n",
target->full_name, prop->name);
return ret;
}
}
@@ -146,9 +148,8 @@ static int of_overlay_apply_one(struct of_overlay *ov,
for_each_child_of_node(overlay, child) {
ret = of_overlay_apply_single_device_node(ov, target, child);
if (ret != 0) {
pr_err("%s: Failed to apply single node @%s/%s\n",
__func__, target->full_name,
child->name);
pr_err("Failed to apply single node @%s/%s\n",
target->full_name, child->name);
of_node_put(child);
return ret;
}
@@ -176,8 +177,7 @@ static int of_overlay_apply(struct of_overlay *ov)
err = of_overlay_apply_one(ov, ovinfo->target, ovinfo->overlay);
if (err != 0) {
pr_err("%s: overlay failed '%s'\n",
__func__, ovinfo->target->full_name);
pr_err("apply failed '%s'\n", ovinfo->target->full_name);
return err;
}
}
@@ -208,7 +208,7 @@ static struct device_node *find_target_node(struct device_node *info_node)
if (ret == 0)
return of_find_node_by_path(path);
pr_err("%s: Failed to find target for node %p (%s)\n", __func__,
pr_err("Failed to find target for node %p (%s)\n",
info_node, info_node->name);
return NULL;
@@ -355,8 +355,6 @@ int of_overlay_create(struct device_node *tree)
id = idr_alloc(&ov_idr, ov, 0, 0, GFP_KERNEL);
if (id < 0) {
pr_err("%s: idr_alloc() failed for tree@%s\n",
__func__, tree->full_name);
err = id;
goto err_destroy_trans;
}
@@ -365,26 +363,21 @@ int of_overlay_create(struct device_node *tree)
/* build the overlay info structures */
err = of_build_overlay_info(ov, tree);
if (err) {
pr_err("%s: of_build_overlay_info() failed for tree@%s\n",
__func__, tree->full_name);
pr_err("of_build_overlay_info() failed for tree@%s\n",
tree->full_name);
goto err_free_idr;
}
/* apply the overlay */
err = of_overlay_apply(ov);
if (err) {
pr_err("%s: of_overlay_apply() failed for tree@%s\n",
__func__, tree->full_name);
if (err)
goto err_abort_trans;
}
/* apply the changeset */
err = __of_changeset_apply(&ov->cset);
if (err) {
pr_err("%s: __of_changeset_apply() failed for tree@%s\n",
__func__, tree->full_name);
if (err)
goto err_revert_overlay;
}
/* add to the tail of the overlay list */
list_add_tail(&ov->node, &ov_list);
@@ -469,8 +462,7 @@ static int overlay_removal_is_ok(struct of_overlay *ov)
list_for_each_entry(ce, &ov->cset.entries, node) {
if (!overlay_is_topmost(ov, ce->np)) {
pr_err("%s: overlay #%d is not topmost\n",
__func__, ov->id);
pr_err("overlay #%d is not topmost\n", ov->id);
return 0;
}
}
@@ -496,16 +488,13 @@ int of_overlay_destroy(int id)
ov = idr_find(&ov_idr, id);
if (ov == NULL) {
err = -ENODEV;
pr_err("%s: Could not find overlay #%d\n",
__func__, id);
pr_err("destroy: Could not find overlay #%d\n", id);
goto out;
}
/* check whether the overlay is safe to remove */
if (!overlay_removal_is_ok(ov)) {
err = -EBUSY;
pr_err("%s: removal check failed for overlay #%d\n",
__func__, id);
goto out;
}