diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-11-22 23:05:46 +0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-11-22 23:05:46 +0400 |
| commit | 515db09338704a6ad7d27b5f1e33820d3052edd2 (patch) | |
| tree | 74f915531710303397d34069b325c2be7a5ac93c /drivers/media/rc/ene_ir.h | |
| parent | 30be52e44fd4276d768efffb55d424fb682e6505 (diff) | |
| parent | cfcfc9eca2bcbd26a8e206baeb005b055dbf8e37 (diff) | |
| download | linux-515db09338704a6ad7d27b5f1e33820d3052edd2.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
Conflicts:
drivers/net/wireless/iwlegacy/iwl-debugfs.c
drivers/net/wireless/iwlegacy/iwl-rx.c
drivers/net/wireless/iwlegacy/iwl-scan.c
drivers/net/wireless/iwlegacy/iwl-tx.c
include/net/bluetooth/bluetooth.h
Diffstat (limited to 'drivers/media/rc/ene_ir.h')
| -rw-r--r-- | drivers/media/rc/ene_ir.h | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/drivers/media/rc/ene_ir.h b/drivers/media/rc/ene_ir.h index 017c209cdf8a..fd108d90f750 100644 --- a/drivers/media/rc/ene_ir.h +++ b/drivers/media/rc/ene_ir.h @@ -182,20 +182,11 @@ #define ENE_HW_C 2 /* 3926C */ #define ENE_HW_D 3 /* 3926D or later */ -#define ene_printk(level, text, ...) \ - printk(level ENE_DRIVER_NAME ": " text "\n", ## __VA_ARGS__) - -#define ene_notice(text, ...) ene_printk(KERN_NOTICE, text, ## __VA_ARGS__) -#define ene_warn(text, ...) ene_printk(KERN_WARNING, text, ## __VA_ARGS__) - - -#define __dbg(level, format, ...) \ - do { \ - if (debug >= level) \ - printk(KERN_DEBUG ENE_DRIVER_NAME \ - ": " format "\n", ## __VA_ARGS__); \ - } while (0) - +#define __dbg(level, format, ...) \ +do { \ + if (debug >= level) \ + pr_debug(format "\n", ## __VA_ARGS__); \ +} while (0) #define dbg(format, ...) __dbg(1, format, ## __VA_ARGS__) #define dbg_verbose(format, ...) __dbg(2, format, ## __VA_ARGS__) |