From: Fabian Frederick Date: Thu, 22 May 2014 00:42:28 +0000 (+1000) Subject: arch/unicore32/mm/ioremap.c: convert printk/warn_on to warn(1 X-Git-Tag: next-20140530~2^2~443 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=046dddffbc579a6b411f717a82bb91faa1a8299a;p=karo-tx-linux.git arch/unicore32/mm/ioremap.c: convert printk/warn_on to warn(1 +coalesce formats Signed-off-by: Fabian Frederick Cc: Guan Xuetao Signed-off-by: Andrew Morton --- diff --git a/arch/unicore32/mm/ioremap.c b/arch/unicore32/mm/ioremap.c index 13068ee22f33..5d9568ceb527 100644 --- a/arch/unicore32/mm/ioremap.c +++ b/arch/unicore32/mm/ioremap.c @@ -143,13 +143,8 @@ void __iomem *__uc32_ioremap_pfn_caller(unsigned long pfn, /* * Don't allow RAM to be mapped */ - if (pfn_valid(pfn)) { - printk(KERN_WARNING "BUG: Your driver calls ioremap() on\n" - "system memory. This leads to architecturally\n" - "unpredictable behaviour, and ioremap() will fail in\n" - "the next kernel release. Please fix your driver.\n"); - WARN_ON(1); - } + if (pfn_valid(pfn)) + WARN(1, "BUG: Your driver calls ioremap() on\nsystem memory. This leads to architecturally\nunpredictable behaviour, and ioremap() will fail in\nthe next kernel release. Please fix your driver.\n"); type = get_mem_type(mtype); if (!type)