arch/unicore32/mm/ioremap.c: convert printk/warn_on to warn()
authorFabian Frederick <fabf@skynet.be>
Wed, 4 Jun 2014 23:05:54 +0000 (16:05 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 4 Jun 2014 23:53:53 +0000 (16:53 -0700)
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>
arch/unicore32/mm/ioremap.c

index 13068ee22f33ded1a66b9207f8068a5aa29905f1..a0840fa054318437139bdfadb6c1eaa96107e6c3 100644 (file)
@@ -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)