aboutsummaryrefslogtreecommitdiffstats
path: root/block
diff options
context:
space:
mode:
authorMitchel Humpherys <mitchelh@codeaurora.org>2014-06-06 17:38:30 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2014-06-06 19:08:18 -0400
commitb1de0d139c97a6078bbada6cf2d27c30ce127a97 (patch)
tree3b318e167b70e14d73278c213e3e5e4e89566773 /block
parentb3fe92b03dd69261f931fe4463d9358e5077e1dc (diff)
mm: convert some level-less printks to pr_*
printk is meant to be used with an associated log level. There are some instances of printk scattered around the mm code where the log level is missing. Add a log level and adhere to suggestions by scripts/checkpatch.pl by moving to the pr_* macros. Also add the typical pr_fmt definition so that print statements can be easily traced back to the modules where they occur, correlated one with another, etc. This will require the removal of some (now redundant) prefixes on a few print statements. Signed-off-by: Mitchel Humpherys <mitchelh@codeaurora.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'block')
-rw-r--r--block/bounce.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/block/bounce.c b/block/bounce.c
index 523918b8c6dc..ab21ba203d5c 100644
--- a/block/bounce.c
+++ b/block/bounce.c
@@ -3,6 +3,8 @@
3 * - Split from highmem.c 3 * - Split from highmem.c
4 */ 4 */
5 5
6#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
7
6#include <linux/mm.h> 8#include <linux/mm.h>
7#include <linux/export.h> 9#include <linux/export.h>
8#include <linux/swap.h> 10#include <linux/swap.h>
@@ -15,6 +17,7 @@
15#include <linux/hash.h> 17#include <linux/hash.h>
16#include <linux/highmem.h> 18#include <linux/highmem.h>
17#include <linux/bootmem.h> 19#include <linux/bootmem.h>
20#include <linux/printk.h>
18#include <asm/tlbflush.h> 21#include <asm/tlbflush.h>
19 22
20#include <trace/events/block.h> 23#include <trace/events/block.h>
@@ -34,7 +37,7 @@ static __init int init_emergency_pool(void)
34 37
35 page_pool = mempool_create_page_pool(POOL_SIZE, 0); 38 page_pool = mempool_create_page_pool(POOL_SIZE, 0);
36 BUG_ON(!page_pool); 39 BUG_ON(!page_pool);
37 printk("bounce pool size: %d pages\n", POOL_SIZE); 40 pr_info("pool size: %d pages\n", POOL_SIZE);
38 41
39 return 0; 42 return 0;
40} 43}
@@ -86,7 +89,7 @@ int init_emergency_isa_pool(void)
86 mempool_free_pages, (void *) 0); 89 mempool_free_pages, (void *) 0);
87 BUG_ON(!isa_page_pool); 90 BUG_ON(!isa_page_pool);
88 91
89 printk("isa bounce pool size: %d pages\n", ISA_POOL_SIZE); 92 pr_info("isa pool size: %d pages\n", ISA_POOL_SIZE);
90 return 0; 93 return 0;
91} 94}
92 95