Use pr_<level> to get the output prefixed by the existing #define pr_fmt
Miscellanea: o Convert bare printk to pr_info o Reduce printk(KERN_WARNING to pr_info as the log level seems better Signed-off-by: Joe Perches <[email protected]> --- kernel/resource.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/kernel/resource.c b/kernel/resource.c index 7ea4306503c5..59b89e40502a 100644 --- a/kernel/resource.c +++ b/kernel/resource.c @@ -901,7 +901,8 @@ void insert_resource_expand_to_fit(struct resource *root, struct resource *new) if (conflict->end > new->end) new->end = conflict->end; - printk("Expanded resource %s due to conflict with %s\n", new->name, conflict->name); + pr_info("Expanded resource %s due to conflict with %s\n", + new->name, conflict->name); } write_unlock(&resource_lock); } @@ -1223,9 +1224,8 @@ void __release_region(struct resource *parent, resource_size_t start, write_unlock(&resource_lock); - printk(KERN_WARNING "Trying to free nonexistent resource " - "<%016llx-%016llx>\n", (unsigned long long)start, - (unsigned long long)end); + pr_warn("Trying to free nonexistent resource <%016llx-%016llx>\n", + (unsigned long long)start, (unsigned long long)end); } EXPORT_SYMBOL(__release_region); @@ -1557,10 +1557,10 @@ int iomem_map_sanity_check(resource_size_t addr, unsigned long size) if (p->flags & IORESOURCE_BUSY) continue; - printk(KERN_WARNING "resource sanity check: requesting [mem %#010llx-%#010llx], which spans more than %s %pR\n", - (unsigned long long)addr, - (unsigned long long)(addr + size - 1), - p->name, p); + pr_info("sanity check: requesting [mem %#010llx-%#010llx], which spans more than %s %pR\n", + (unsigned long long)addr, + (unsigned long long)(addr + size - 1), + p->name, p); err = -1; break; }
