As said in commit f2c2cbcc35d4 ("powerpc: Use pr_warn instead of
pr_warning"), removing pr_warning so all logging messages use a
consistent <prefix>_warn style. Let's do it.

Cc: Rob Herring <robh...@kernel.org>
Cc: Frank Rowand <frowand.l...@gmail.com>
Reviewed-by: Sergey Senozhatsky <sergey.senozhat...@gmail.com>
Signed-off-by: Kefeng Wang <wangkefeng.w...@huawei.com>
---
 drivers/of/fdt.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c
index d01d834b26b0..2cdf64d2456f 100644
--- a/drivers/of/fdt.c
+++ b/drivers/of/fdt.c
@@ -412,8 +412,8 @@ void *__unflatten_device_tree(const void *blob,
        /* Second pass, do actual unflattening */
        unflatten_dt_nodes(blob, mem, dad, mynodes);
        if (be32_to_cpup(mem + size) != 0xdeadbeef)
-               pr_warning("End of tree marker overwritten: %08x\n",
-                          be32_to_cpup(mem + size));
+               pr_warn("End of tree marker overwritten: %08x\n",
+                       be32_to_cpup(mem + size));
 
        if (detached && mynodes) {
                of_node_set_flag(*mynodes, OF_DETACHED);
@@ -1120,25 +1120,25 @@ void __init __weak early_init_dt_add_memory_arch(u64 
base, u64 size)
        size &= PAGE_MASK;
 
        if (base > MAX_MEMBLOCK_ADDR) {
-               pr_warning("Ignoring memory block 0x%llx - 0x%llx\n",
-                               base, base + size);
+               pr_warn("Ignoring memory block 0x%llx - 0x%llx\n",
+                       base, base + size);
                return;
        }
 
        if (base + size - 1 > MAX_MEMBLOCK_ADDR) {
-               pr_warning("Ignoring memory range 0x%llx - 0x%llx\n",
-                               ((u64)MAX_MEMBLOCK_ADDR) + 1, base + size);
+               pr_warn("Ignoring memory range 0x%llx - 0x%llx\n",
+                       ((u64)MAX_MEMBLOCK_ADDR) + 1, base + size);
                size = MAX_MEMBLOCK_ADDR - base + 1;
        }
 
        if (base + size < phys_offset) {
-               pr_warning("Ignoring memory block 0x%llx - 0x%llx\n",
-                          base, base + size);
+               pr_warn("Ignoring memory block 0x%llx - 0x%llx\n",
+                       base, base + size);
                return;
        }
        if (base < phys_offset) {
-               pr_warning("Ignoring memory range 0x%llx - 0x%llx\n",
-                          base, phys_offset);
+               pr_warn("Ignoring memory range 0x%llx - 0x%llx\n",
+                       base, phys_offset);
                size -= phys_offset - base;
                base = phys_offset;
        }
-- 
2.20.1

Reply via email to