diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-01-13 10:57:34 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-01-16 14:29:41 +0100 |
| commit | 278850a4421ab7cdfd271a6b8e774c77e154e9d0 (patch) | |
| tree | 02b3eced790e9874a3986aba8f33e759b08c8320 /fs | |
| parent | d95f27aaa83381ce210d3b285ad2647ce0313bbb (diff) | |
| download | barebox-278850a4421ab7cdfd271a6b8e774c77e154e9d0.tar.gz | |
fs ubifs: Use pr_* for printing messages
Unline the printk(KERN_* the pr_* functions cooperate with the
barebox loglevel.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/ubifs/debug.h | 10 | ||||
| -rw-r--r-- | fs/ubifs/ubifs.h | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/fs/ubifs/debug.h b/fs/ubifs/debug.h index 62617b6927..dbc7f18fa1 100644 --- a/fs/ubifs/debug.h +++ b/fs/ubifs/debug.h @@ -85,7 +85,7 @@ struct ubifs_debug_info { #define ubifs_assert(expr) do { \ if (unlikely(!(expr))) { \ - printk(KERN_CRIT "UBIFS assert failed in %s at %u (pid %d)\n", \ + pr_crit("UBIFS assert failed in %s at %u (pid %d)\n", \ __func__, __LINE__, 0); \ dbg_dump_stack(); \ } \ @@ -94,7 +94,7 @@ struct ubifs_debug_info { #define ubifs_assert_cmt_locked(c) do { \ if (unlikely(down_write_trylock(&(c)->commit_sem))) { \ up_write(&(c)->commit_sem); \ - printk(KERN_CRIT "commit lock is not locked!\n"); \ + pr_crit("commit lock is not locked!\n"); \ ubifs_assert(0); \ } \ } while (0) @@ -107,7 +107,7 @@ struct ubifs_debug_info { /* Generic debugging messages */ #define dbg_msg(fmt, ...) do { \ spin_lock(&dbg_lock); \ - printk(KERN_DEBUG "UBIFS DBG (pid %d): %s: " fmt "\n", 0, \ + pr_debug("UBIFS DBG (pid %d): %s: " fmt "\n", 0, \ __func__, ##__VA_ARGS__); \ spin_unlock(&dbg_lock); \ } while (0) @@ -310,7 +310,7 @@ void ubifs_debugging_exit(struct ubifs_info *c); /* Use "if (0)" to make compiler check arguments even if debugging is off */ #define ubifs_assert(expr) do { \ if (0 && (expr)) \ - printk(KERN_CRIT "UBIFS assert failed in %s at %u (pid %d)\n", \ + pr_crit("UBIFS assert failed in %s at %u (pid %d)\n", \ __func__, __LINE__, 0); \ } while (0) @@ -321,7 +321,7 @@ void ubifs_debugging_exit(struct ubifs_info *c); #define dbg_msg(fmt, ...) do { \ if (0) \ - printk(KERN_DEBUG "UBIFS DBG (pid %d): %s: " fmt "\n", \ + pr_debug("UBIFS DBG (pid %d): %s: " fmt "\n", \ 0, __func__, ##__VA_ARGS__); \ } while (0) diff --git a/fs/ubifs/ubifs.h b/fs/ubifs/ubifs.h index 1e6c0f5a73..fea158466e 100644 --- a/fs/ubifs/ubifs.h +++ b/fs/ubifs/ubifs.h @@ -474,15 +474,15 @@ static inline ino_t parent_ino(struct dentry *dentry) #define ubifs_msg(fmt, ...) #else #define ubifs_msg(fmt, ...) \ - printk(KERN_NOTICE "UBIFS: " fmt "\n", ##__VA_ARGS__) + pr_notice("UBIFS: " fmt "\n", ##__VA_ARGS__) #endif /* UBIFS error messages */ #define ubifs_err(fmt, ...) \ - printk(KERN_ERR "UBIFS error (pid %d): %s: " fmt "\n", 0, \ + pr_err("UBIFS error (pid %d): %s: " fmt "\n", 0, \ __func__, ##__VA_ARGS__) /* UBIFS warning messages */ #define ubifs_warn(fmt, ...) \ - printk(KERN_WARNING "UBIFS warning (pid %d): %s: " fmt "\n", \ + pr_warn("UBIFS warning (pid %d): %s: " fmt "\n", \ 0, __func__, ##__VA_ARGS__) /* UBIFS file system VFS magic number */ |