aboutsummaryrefslogtreecommitdiffstats
path: root/arch/unicore32/mm
diff options
context:
space:
mode:
authorFabian Frederick <fabf@skynet.be>2014-06-04 19:05:54 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2014-06-04 19:53:53 -0400
commitacc8a1c00585c5cd62fcafd9309ef40ac35e8bfa (patch)
treee90a523aa44ee210ba21e24d798afb29af062636 /arch/unicore32/mm
parent220108361f7cef9bc3ac0b4c84cb556d36ec2a6f (diff)
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>
Diffstat (limited to 'arch/unicore32/mm')
-rw-r--r--arch/unicore32/mm/ioremap.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/unicore32/mm/ioremap.c b/arch/unicore32/mm/ioremap.c
index 13068ee22f33..a0840fa05431 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,
143 /* 143 /*
144 * Don't allow RAM to be mapped 144 * Don't allow RAM to be mapped
145 */ 145 */
146 if (pfn_valid(pfn)) { 146 if (pfn_valid(pfn))
147 printk(KERN_WARNING "BUG: Your driver calls ioremap() on\n" 147 WARN(1, "BUG: Your driver calls ioremap() on\n"
148 "system memory. This leads to architecturally\n" 148 "system memory. This leads to architecturally\n"
149 "unpredictable behaviour, and ioremap() will fail in\n" 149 "unpredictable behaviour, and ioremap() will fail in\n"
150 "the next kernel release. Please fix your driver.\n"); 150 "the next kernel release. Please fix your driver.\n");
151 WARN_ON(1);
152 }
153 151
154 type = get_mem_type(mtype); 152 type = get_mem_type(mtype);
155 if (!type) 153 if (!type)