From: Fabian Frederick <fabf@skynet.be>
Date: Wed, 4 Jun 2014 23:05:54 +0000 (-0700)
Subject: arch/unicore32/mm/ioremap.c: convert printk/warn_on to warn()
X-Git-Tag: v3.16-rc1~47^2~16^2~259
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=acc8a1c00585c5cd62fcafd9309ef40ac35e8bfa;p=~emulex%2Finfiniband.git

arch/unicore32/mm/ioremap.c: convert printk/warn_on to warn()

Coalesce formats.

[akpm@linux-foundation.org: undo crazy long line]
Signed-off-by: Fabian Frederick <fabf@skynet.be>
Cc: Guan Xuetao <gxt@mprc.pku.edu.cn>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/arch/unicore32/mm/ioremap.c b/arch/unicore32/mm/ioremap.c
index 13068ee22f3..a0840fa0543 100644
--- a/arch/unicore32/mm/ioremap.c
+++ b/arch/unicore32/mm/ioremap.c
@@ -143,13 +143,11 @@ 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"
+	if (pfn_valid(pfn))
+		WARN(1, "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);
-	}
 
 	type = get_mem_type(mtype);
 	if (!type)