From de771bdaaa9dd2585c59e1bd6cf2cac83aa0beec Mon Sep 17 00:00:00 2001 From: Fabian Frederick Date: Fri, 8 Aug 2014 14:20:59 -0700 Subject: fs/ufs: use pr_fmt Replace UFS-fs, UFS-fs: and UFS: by pr_fmt with module name "ufs: " Signed-off-by: Fabian Frederick Cc: Evgeniy Dushistov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- fs/ufs/ufs.h | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'fs/ufs/ufs.h') diff --git a/fs/ufs/ufs.h b/fs/ufs/ufs.h index 343e6fc571e..cbe1e9be901 100644 --- a/fs/ufs/ufs.h +++ b/fs/ufs/ufs.h @@ -1,6 +1,12 @@ #ifndef _UFS_UFS_H #define _UFS_UFS_H 1 +#ifdef pr_fmt +#undef pr_fmt +#endif + +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + #define UFS_MAX_GROUP_LOADED 8 #define UFS_CGNO_EMPTY ((unsigned)-1) -- cgit v1.2.3-70-g09d2 From d4beaabd307b4b7853ac97013ab0d6ee69429b04 Mon Sep 17 00:00:00 2001 From: Fabian Frederick Date: Fri, 8 Aug 2014 14:21:05 -0700 Subject: fs/ufs: convert UFSD printk to pr_debug Convert no level printk to pr_debug in UFSD. DEBUG is defined with CONFIG_UFS_DEBUG so pr_debug are emitted here. Also fixing call to UFSD (add;) Signed-off-by: Fabian Frederick Cc: Evgeniy Dushistov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- fs/ufs/super.c | 2 +- fs/ufs/ufs.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'fs/ufs/ufs.h') diff --git a/fs/ufs/super.c b/fs/ufs/super.c index 206f7d6f1ed..da73801301d 100644 --- a/fs/ufs/super.c +++ b/fs/ufs/super.c @@ -868,7 +868,7 @@ static int ufs_fill_super(struct super_block *sb, void *data, int silent) break; case UFS_MOUNT_UFSTYPE_SUNOS: - UFSD(("ufstype=sunos\n")) + UFSD("ufstype=sunos\n"); uspi->s_fsize = block_size = 1024; uspi->s_fmask = ~(1024 - 1); uspi->s_fshift = 10; diff --git a/fs/ufs/ufs.h b/fs/ufs/ufs.h index cbe1e9be901..2a07396d5f9 100644 --- a/fs/ufs/ufs.h +++ b/fs/ufs/ufs.h @@ -77,9 +77,9 @@ struct ufs_inode_info { */ #ifdef CONFIG_UFS_DEBUG # define UFSD(f, a...) { \ - printk ("UFSD (%s, %d): %s:", \ + pr_debug("UFSD (%s, %d): %s:", \ __FILE__, __LINE__, __func__); \ - printk (f, ## a); \ + pr_debug(f, ## a); \ } #else # define UFSD(f, a...) /**/ -- cgit v1.2.3-70-g09d2