of: Use pr_warn instead of pr_warning
As said in commit f2c2cbcc35
("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.
Link: http://lkml.kernel.org/r/20191018031850.48498-16-wangkefeng.wang@huawei.com
To: linux-kernel@vger.kernel.org
Cc: Rob Herring <robh+dt@kernel.org>
Cc: Frank Rowand <frowand.list@gmail.com>
Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
Reviewed-by: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
Signed-off-by: Petr Mladek <pmladek@suse.com>
This commit is contained in:
parent
2ee9a0db92
commit
e2f04da75c
|
@ -483,8 +483,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);
|
||||
|
@ -1141,25 +1141,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;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue