dm: convert DM printk macros to pr_<level> macros

Using pr_<level> is the more common logging style.

Standardize style and use new macro DM_FMT.
Use no_printk in DMDEBUG macros when CONFIG_DM_DEBUG is not #defined.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Mike Snitzer <snitzer@redhat.com>

1 files changed, 32 insertions, 39 deletions

diff --git a/include/linux/device-mapper.h b/include/linux/device-mapper.h
index 456da5017b32..19bc7fdfd6da 100644
--- a/include/linux/device-mapper.h
+++ b/include/linux/device-mapper.h
@@ -543,48 +543,41 @@ extern struct ratelimit_state dm_ratelimit_state;
 #define dm_ratelimit()  0
 #endif
 
-#define DMCRIT(f, arg...) \
-        printk(KERN_CRIT DM_NAME ": " DM_MSG_PREFIX ": " f "\n", ## arg)
-
-#define DMERR(f, arg...) \
-        printk(KERN_ERR DM_NAME ": " DM_MSG_PREFIX ": " f "\n", ## arg)
-#define DMERR_LIMIT(f, arg...) \
-        do { \
-                if (dm_ratelimit())     \
-                        printk(KERN_ERR DM_NAME ": " DM_MSG_PREFIX ": " \
-                               f "\n", ## arg); \
-        } while (0)
-
-#define DMWARN(f, arg...) \
-        printk(KERN_WARNING DM_NAME ": " DM_MSG_PREFIX ": " f "\n", ## arg)
-#define DMWARN_LIMIT(f, arg...) \
-        do { \
-                if (dm_ratelimit())     \
-                        printk(KERN_WARNING DM_NAME ": " DM_MSG_PREFIX ": " \
-                               f "\n", ## arg); \
-        } while (0)
-
-#define DMINFO(f, arg...) \
-        printk(KERN_INFO DM_NAME ": " DM_MSG_PREFIX ": " f "\n", ## arg)
-#define DMINFO_LIMIT(f, arg...) \
-        do { \
-                if (dm_ratelimit())     \
-                        printk(KERN_INFO DM_NAME ": " DM_MSG_PREFIX ": " f \
-                               "\n", ## arg); \
-        } while (0)
+#define DM_FMT(fmt) DM_NAME ": " DM_MSG_PREFIX ": " fmt "\n"
+
+#define DMCRIT(fmt, ...) pr_crit(DM_FMT(fmt), ##__VA_ARGS__)
+
+#define DMERR(fmt, ...) pr_err(DM_FMT(fmt), ##__VA_ARGS__)
+#define DMERR_LIMIT(fmt, ...)                                           \
+do {                                                                    \
+        if (dm_ratelimit())                                             \
+                DMERR(fmt, ##__VA_ARGS__);                              \
+} while (0)
+
+#define DMWARN(fmt, ...) pr_warn(DM_FMT(fmt), ##__VA_ARGS__)
+#define DMWARN_LIMIT(fmt, ...)                                          \
+do {                                                                    \
+        if (dm_ratelimit())                                             \
+                DMWARN(fmt, ##__VA_ARGS__);                             \
+} while (0)
+
+#define DMINFO(fmt, ...) pr_info(DM_FMT(fmt), ##__VA_ARGS__)
+#define DMINFO_LIMIT(fmt, ...)                                          \
+do {                                                                    \
+        if (dm_ratelimit())                                             \
+                DMINFO(fmt, ##__VA_ARGS__);                             \
+} while (0)
 
 #ifdef CONFIG_DM_DEBUG
-#  define DMDEBUG(f, arg...) \
-        printk(KERN_DEBUG DM_NAME ": " DM_MSG_PREFIX " DEBUG: " f "\n", ## arg)
-#  define DMDEBUG_LIMIT(f, arg...) \
-        do { \
-                if (dm_ratelimit())     \
-                        printk(KERN_DEBUG DM_NAME ": " DM_MSG_PREFIX ": " f \
-                               "\n", ## arg); \
-        } while (0)
+#define DMDEBUG(fmt, ...) printk(KERN_DEBUG DM_FMT(fmt), ##__VA_ARGS__)
+#define DMDEBUG_LIMIT(fmt, ...)                                         \
+do {                                                                    \
+        if (dm_ratelimit())                                             \
+                DMDEBUG(fmt, ##__VA_ARGS__);                            \
+} while (0)
 #else
-#  define DMDEBUG(f, arg...) do {} while (0)
-#  define DMDEBUG_LIMIT(f, arg...) do {} while (0)
+#define DMDEBUG(fmt, ...) no_printk(fmt, ##__VA_ARGS__)
+#define DMDEBUG_LIMIT(fmt, ...) no_printk(fmt, ##__VA_ARGS__)
 #endif
 
 #define DMEMIT(x...) sz += ((sz >= maxlen) ? \