Merge branch 'linus'

[platform/kernel/linux-starfive.git] / kernel / resource.c

diff --git a/kernel/resource.c b/kernel/resource.c
index 82ed54c..ddbbacb 100644 (file)
--- a/kernel/resource.c
+++ b/kernel/resource.c
@@ -888,7 +888,7 @@ 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);
 }
@@ -1283,9 +1283,7 @@ 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 <%pa-%pa>\n", &start, &end);
 }
 EXPORT_SYMBOL(__release_region);
 
@@ -1658,6 +1656,7 @@ __setup("reserve=", reserve_setup);
 int iomem_map_sanity_check(resource_size_t addr, unsigned long size)
 {
        struct resource *p = &iomem_resource;
+       resource_size_t end = addr + size - 1;
        int err = 0;
        loff_t l;
 
@@ -1667,12 +1666,12 @@ int iomem_map_sanity_check(resource_size_t addr, unsigned long size)
                 * We can probably skip the resources without
                 * IORESOURCE_IO attribute?
                 */
-               if (p->start >= addr + size)
+               if (p->start > end)
                        continue;
                if (p->end < addr)
                        continue;
                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;
                /*
                 * 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)
                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_warn("resource sanity check: requesting [mem %pa-%pa], which spans more than %s %pR\n",
+                       &addr, &end, p->name, p);
                err = -1;
                break;
        }