Commit e2f04da7 authored by Kefeng Wang's avatar Kefeng Wang Committed by Petr Mladek
Browse files

of: Use pr_warn instead of pr_warning 

As said in commit f2c2cbcc ("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: default avatarKefeng Wang <wangkefeng.wang@huawei.com>
Reviewed-by: default avatarSergey Senozhatsky <sergey.senozhatsky@gmail.com>
Signed-off-by: default avatarPetr Mladek <pmladek@suse.com>
parent 2ee9a0db

drivers/of/fdt.c

+10 −10
Original line number Diff line number Diff line
@@ -483,7 +483,7 @@ 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",

		pr_warn("End of tree marker overwritten: %08x\n",

			be32_to_cpup(mem + size));



	if (detached && mynodes) {
@@ -1141,24 +1141,24 @@ 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",

		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",

		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",

		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",

		pr_warn("Ignoring memory range 0x%llx - 0x%llx\n",

			base, phys_offset);

		size -= phys_offset - base;

		base = phys_offset;

CRA Git | Maintained and supported by SUSTech CRA and CCSE