diff options
| author |   Joe Perches <joe@perches.com> | 2012-02-15 15:56:44 -0800 |
|---|---|---|
| committer |   David Woodhouse <David.Woodhouse@intel.com> | 2012-03-27 00:39:40 +0100 |
| commit | da320f055a8818269c008e30b887cdcf09d8e4bd (patch) | |
| tree | deaead9c0bd0ed473e633fca2d66460b3b0ec99d /fs/jffs2/debug.c | |
| parent | jffs2: Convert most D1/D2 macros to jffs2_dbg (diff) | |
| download | wireguard-linux-da320f055a8818269c008e30b887cdcf09d8e4bd.tar.xz wireguard-linux-da320f055a8818269c008e30b887cdcf09d8e4bd.zip | |
jffs2: Convert printks to pr_<level>
Use the more current logging style.
Coalesce formats, align arguments.
Convert uses of embedded function names to %s, __func__.
A couple of long line checkpatch errors I don't care about exist.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Diffstat (limited to 'fs/jffs2/debug.c')
| -rw-r--r-- | fs/jffs2/debug.c | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/fs/jffs2/debug.c b/fs/jffs2/debug.c index e0b76c87a91a..6cac7d6aad69 100644 --- a/fs/jffs2/debug.c +++ b/fs/jffs2/debug.c @@ -261,12 +261,15 @@ void __jffs2_dbg_superblock_counts(struct jffs2_sb_info *c) bad += c->sector_size; } -#define check(sz) \ - if (sz != c->sz##_size) { \ - printk(KERN_WARNING #sz "_size mismatch counted 0x%x, c->" #sz "_size 0x%x\n", \ - sz, c->sz##_size); \ - dump = 1; \ - } +#define check(sz) \ +do { \ + if (sz != c->sz##_size) { \ + pr_warn("%s_size mismatch counted 0x%x, c->%s_size 0x%x\n", \ + #sz, #sz, sz, c->sz##_size); \ + dump = 1; \ + } \ +} while (0) + check(free); check(dirty); check(used); @@ -274,11 +277,12 @@ void __jffs2_dbg_superblock_counts(struct jffs2_sb_info *c) check(unchecked); check(bad); check(erasing); + #undef check if (nr_counted != c->nr_blocks) { - printk(KERN_WARNING "%s counted only 0x%x blocks of 0x%x. Where are the others?\n", - __func__, nr_counted, c->nr_blocks); + pr_warn("%s counted only 0x%x blocks of 0x%x. Where are the others?\n", + __func__, nr_counted, c->nr_blocks); dump = 1; } |