Commit 2a4e6285 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Greg Kroah-Hartman

resource: Replace printk(KERN_WARNING) by pr_warn(), printk() by pr_info()

Replace printk(KERN_WARNING) by pr_warn() and printk() by pr_info().

While at it, use %pa for the resource_size_t variables. With that,
for the sake of consistency, introduce a temporary variable for
the end address in iomem_map_sanity_check() like it's done in another
function in the same module.
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: default avatarRafael J. Wysocki <rafael@kernel.org>
Link: https://lore.kernel.org/r/20221109155618.42276-1-andriy.shevchenko@linux.intel.comSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d4ad017d
...@@ -888,7 +888,7 @@ void insert_resource_expand_to_fit(struct resource *root, struct resource *new) ...@@ -888,7 +888,7 @@ void insert_resource_expand_to_fit(struct resource *root, struct resource *new)
if (conflict->end > new->end) if (conflict->end > new->end)
new->end = conflict->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); write_unlock(&resource_lock);
} }
...@@ -1283,9 +1283,7 @@ void __release_region(struct resource *parent, resource_size_t start, ...@@ -1283,9 +1283,7 @@ void __release_region(struct resource *parent, resource_size_t start,
write_unlock(&resource_lock); write_unlock(&resource_lock);
printk(KERN_WARNING "Trying to free nonexistent resource " pr_warn("Trying to free nonexistent resource <%pa-%pa>\n", &start, &end);
"<%016llx-%016llx>\n", (unsigned long long)start,
(unsigned long long)end);
} }
EXPORT_SYMBOL(__release_region); EXPORT_SYMBOL(__release_region);
...@@ -1658,6 +1656,7 @@ __setup("reserve=", reserve_setup); ...@@ -1658,6 +1656,7 @@ __setup("reserve=", reserve_setup);
int iomem_map_sanity_check(resource_size_t addr, unsigned long size) int iomem_map_sanity_check(resource_size_t addr, unsigned long size)
{ {
struct resource *p = &iomem_resource; struct resource *p = &iomem_resource;
resource_size_t end = addr + size - 1;
int err = 0; int err = 0;
loff_t l; loff_t l;
...@@ -1667,12 +1666,12 @@ int iomem_map_sanity_check(resource_size_t addr, unsigned long size) ...@@ -1667,12 +1666,12 @@ int iomem_map_sanity_check(resource_size_t addr, unsigned long size)
* We can probably skip the resources without * We can probably skip the resources without
* IORESOURCE_IO attribute? * IORESOURCE_IO attribute?
*/ */
if (p->start >= addr + size) if (p->start > end)
continue; continue;
if (p->end < addr) if (p->end < addr)
continue; continue;
if (PFN_DOWN(p->start) <= PFN_DOWN(addr) && if (PFN_DOWN(p->start) <= PFN_DOWN(addr) &&
PFN_DOWN(p->end) >= PFN_DOWN(addr + size - 1)) PFN_DOWN(p->end) >= PFN_DOWN(end))
continue; continue;
/* /*
* if a resource is "BUSY", it's not a hardware resource * if a resource is "BUSY", it's not a hardware resource
...@@ -1683,10 +1682,8 @@ int iomem_map_sanity_check(resource_size_t addr, unsigned long size) ...@@ -1683,10 +1682,8 @@ int iomem_map_sanity_check(resource_size_t addr, unsigned long size)
if (p->flags & IORESOURCE_BUSY) if (p->flags & IORESOURCE_BUSY)
continue; continue;
printk(KERN_WARNING "resource sanity check: requesting [mem %#010llx-%#010llx], which spans more than %s %pR\n", pr_warn("resource sanity check: requesting [mem %pa-%pa], which spans more than %s %pR\n",
(unsigned long long)addr, &addr, &end, p->name, p);
(unsigned long long)(addr + size - 1),
p->name, p);
err = -1; err = -1;
break; break;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment