]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
arch/unicore32/mm/ioremap.c: convert printk/warn_on to warn(1
authorFabian Frederick <fabf@skynet.be>
Thu, 22 May 2014 00:42:28 +0000 (10:42 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 22 May 2014 00:42:28 +0000 (10:42 +1000)
+coalesce formats

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>
arch/unicore32/mm/ioremap.c

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