瀏覽代碼

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>
Fabian Frederick 11 年之前
父節點
當前提交
acc8a1c005
共有 1 個文件被更改,包括 2 次插入4 次删除
  1. 2 4
      arch/unicore32/mm/ioremap.c

+ 2 - 4
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
 	 * 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"
 			"system memory.  This leads to architecturally\n"
 			"unpredictable behaviour, and ioremap() will fail in\n"
 			"unpredictable behaviour, and ioremap() will fail in\n"
 			"the next kernel release. Please fix your driver.\n");
 			"the next kernel release. Please fix your driver.\n");
-		WARN_ON(1);
-	}
 
 
 	type = get_mem_type(mtype);
 	type = get_mem_type(mtype);
 	if (!type)
 	if (!type)