Merge tag 'for-v5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux...

[linux-2.6-microblaze.git] / drivers / of / fdt.c

diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c
index ba17a80..e0f96e3 100644 (file)
--- a/drivers/of/fdt.c
+++ b/drivers/of/fdt.c
@@ -510,11 +510,11 @@ static int __init __reserved_mem_reserve_reg(unsigned long node,
 
                if (size &&
                    early_init_dt_reserve_memory_arch(base, size, nomap) == 0)
-                       pr_debug("Reserved memory: reserved region for node '%s': base %pa, size %ld MiB\n",
-                               uname, &base, (unsigned long)size / SZ_1M);
+                       pr_debug("Reserved memory: reserved region for node '%s': base %pa, size %lu MiB\n",
+                               uname, &base, (unsigned long)(size / SZ_1M));
                else
-                       pr_info("Reserved memory: failed to reserve memory for node '%s': base %pa, size %ld MiB\n",
-                               uname, &base, (unsigned long)size / SZ_1M);
+                       pr_info("Reserved memory: failed to reserve memory for node '%s': base %pa, size %lu MiB\n",
+                               uname, &base, (unsigned long)(size / SZ_1M));
 
                len -= t_len;
                if (first) {
@@ -900,8 +900,7 @@ static void __init early_init_dt_check_for_initrd(unsigned long node)
        phys_initrd_start = start;
        phys_initrd_size = end - start;
 
-       pr_debug("initrd_start=0x%llx  initrd_end=0x%llx\n",
-                (unsigned long long)start, (unsigned long long)end);
+       pr_debug("initrd_start=0x%llx  initrd_end=0x%llx\n", start, end);
 }
 #else
 static inline void early_init_dt_check_for_initrd(unsigned long node)
@@ -1027,8 +1026,7 @@ int __init early_init_dt_scan_memory(unsigned long node, const char *uname,
 
                if (size == 0)
                        continue;
-               pr_debug(" - %llx ,  %llx\n", (unsigned long long)base,
-                   (unsigned long long)size);
+               pr_debug(" - %llx, %llx\n", base, size);
 
                early_init_dt_add_memory_arch(base, size);