summaryrefslogtreecommitdiff
path: root/drivers/input/serio/i8042.h
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2010-11-29 23:33:07 -0800
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2010-11-30 23:10:20 -0800
commit4eb3c30b2e034b673df3e8f21b497e39f3911a02 (patch)
tree013e473ebaee813ccbc7e5dfeed19cd6fe8fa3de /drivers/input/serio/i8042.h
parentb029ffafe89cf4b97cf39e0225a5205cbbf9e02f (diff)
downloadlinux-next-4eb3c30b2e034b673df3e8f21b497e39f3911a02.tar.gz
Input: i8042 - use pr_<level>, pr_fmt, fix dbg and __FILE__ use
Standardized message logging prefixes. Removed \n from dbg macro, added \n to each dbg call site. Removed direct use of __FILE__ from dbg, converted to pr_fmt(fmt) Added non-debug printf argument verification of dbg calls Removed "i8042.c" from printks, converted to pr_<level> Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input/serio/i8042.h')
-rw-r--r--drivers/input/serio/i8042.h14
1 files changed, 9 insertions, 5 deletions
diff --git a/drivers/input/serio/i8042.h b/drivers/input/serio/i8042.h
index cbc1beb66574..ac1d759d0f55 100644
--- a/drivers/input/serio/i8042.h
+++ b/drivers/input/serio/i8042.h
@@ -89,15 +89,19 @@
#ifdef DEBUG
static unsigned long i8042_start_time;
#define dbg_init() do { i8042_start_time = jiffies; } while (0)
-#define dbg(format, arg...) \
- do { \
+#define dbg(format, arg...) \
+ do { \
if (i8042_debug) \
- printk(KERN_DEBUG __FILE__ ": " format " [%d]\n" , \
- ## arg, (int) (jiffies - i8042_start_time)); \
+ printk(KERN_DEBUG KBUILD_MODNAME ": [%d] " format, \
+ (int) (jiffies - i8042_start_time), ##arg); \
} while (0)
#else
#define dbg_init() do { } while (0)
-#define dbg(format, arg...) do {} while (0)
+#define dbg(format, arg...) \
+ do { \
+ if (0) \
+ printk(KERN_DEBUG pr_fmt(format), ##arg); \
+ } while (0)
#endif
#endif /* _I8042_H */