diff options
| author | Hans Verkuil <devnull@localhost> | 2006-01-02 22:31:44 +0000 |
|---|---|---|
| committer | Hans Verkuil <devnull@localhost> | 2006-01-02 22:31:44 +0000 |
| commit | 9a57596ab92a5a0cdf8d1f205383da9b84aaf555 (patch) | |
| tree | 05581625c203f45a06fb18125bd22a6b5d652d20 /linux/drivers/media/video/tveeprom.c | |
| parent | 799ff13cd8717f515448778273a21144725c9443 (diff) | |
| download | mediapointer-dvb-s2-9a57596ab92a5a0cdf8d1f205383da9b84aaf555.tar.gz mediapointer-dvb-s2-9a57596ab92a5a0cdf8d1f205383da9b84aaf555.tar.bz2 | |
convert diagnostics over to the new v4l2-common.h macros.
- convert diagnostics over to the new v4l2-common.h macros.
- deprecated tuner_debug option, the new option is debug.
- renamed cx25840_debug to debug.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Diffstat (limited to 'linux/drivers/media/video/tveeprom.c')
| -rw-r--r-- | linux/drivers/media/video/tveeprom.c | 30 |
1 files changed, 8 insertions, 22 deletions
diff --git a/linux/drivers/media/video/tveeprom.c b/linux/drivers/media/video/tveeprom.c index d042afa59..28971b473 100644 --- a/linux/drivers/media/video/tveeprom.c +++ b/linux/drivers/media/video/tveeprom.c @@ -44,6 +44,7 @@ #include <media/tuner.h> #include <media/tveeprom.h> +#include <media/v4l2-common.h> #include <media/audiochip.h> MODULE_DESCRIPTION("i2c Hauppauge eeprom decoder driver"); @@ -56,29 +57,14 @@ MODULE_PARM_DESC(debug, "Debug level (0-1)"); #define STRM(array,i) (i < sizeof(array)/sizeof(char*) ? array[i] : "unknown") -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) -#define tveeprom_info(fmt, arg...) do {\ - printk(KERN_INFO "tveeprom %d-%04x: " fmt, \ - c->adapter->nr, c->addr , ##arg); } while (0) -#define tveeprom_warn(fmt, arg...) do {\ - printk(KERN_WARNING "tveeprom %d-%04x: " fmt, \ - c->adapter->nr, c->addr , ##arg); } while (0) -#define tveeprom_dbg(fmt, arg...) do {\ - if (debug) \ - printk(KERN_INFO "tveeprom %d-%04x: " fmt, \ - c->adapter->nr, c->addr , ##arg); } while (0) -#else -#define tveeprom_info(fmt, arg...) do {\ - printk(KERN_INFO "tveeprom %04x: " fmt, \ - c->addr , ##arg); } while (0) -#define tveeprom_warn(fmt, arg...) do {\ - printk(KERN_WARNING "tveeprom %04x: " fmt, \ - c->addr , ##arg); } while (0) -#define tveeprom_dbg(fmt, arg...) do {\ +#define tveeprom_info(fmt, arg...) \ + v4l_printk(KERN_INFO, "tveeprom", c->adapter, c->addr, fmt , ## arg) +#define tveeprom_warn(fmt, arg...) \ + v4l_printk(KERN_WARNING, "tveeprom", c->adapter, c->addr, fmt , ## arg) +#define tveeprom_dbg(fmt, arg...) do { \ if (debug) \ - printk(KERN_INFO "tveeprom %04x: " fmt, \ - c->addr , ##arg); } while (0) -#endif + v4l_printk(KERN_DEBUG, "tveeprom", c->adapter, c->addr, fmt , ## arg); \ + } while (0) /* * The Hauppauge eeprom uses an 8bit field to determine which |