From 046dddffbc579a6b411f717a82bb91faa1a8299a Mon Sep 17 00:00:00 2001 From: Fabian Frederick Date: Thu, 22 May 2014 10:42:28 +1000 Subject: [PATCH] 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 --- arch/unicore32/mm/ioremap.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) 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) -- 2.39.5