diff options
author | Hans Verkuil <hverkuil@xs4all.nl> | 2006-01-09 12:32:40 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@brturbo.com.br> | 2006-01-09 12:32:40 -0500 |
commit | fac9e89999a12f378112fe93764b30196bc03f46 (patch) | |
tree | 6daf5fee44efe3d878358d17fa9934139d0c7ade /drivers/media/video/tveeprom.c | |
parent | 0e7072ef6623c3dc58faf3f7310aba77b0a5845e (diff) |
V4L/DVB (3278): 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>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Diffstat (limited to 'drivers/media/video/tveeprom.c')
-rw-r--r-- | drivers/media/video/tveeprom.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/drivers/media/video/tveeprom.c b/drivers/media/video/tveeprom.c index 9bb367863a6f..fd0acc5da667 100644 --- a/drivers/media/video/tveeprom.c +++ b/drivers/media/video/tveeprom.c | |||
@@ -40,6 +40,7 @@ | |||
40 | 40 | ||
41 | #include <media/tuner.h> | 41 | #include <media/tuner.h> |
42 | #include <media/tveeprom.h> | 42 | #include <media/tveeprom.h> |
43 | #include <media/v4l2-common.h> | ||
43 | #include <media/audiochip.h> | 44 | #include <media/audiochip.h> |
44 | 45 | ||
45 | MODULE_DESCRIPTION("i2c Hauppauge eeprom decoder driver"); | 46 | MODULE_DESCRIPTION("i2c Hauppauge eeprom decoder driver"); |
@@ -52,16 +53,14 @@ MODULE_PARM_DESC(debug, "Debug level (0-1)"); | |||
52 | 53 | ||
53 | #define STRM(array,i) (i < sizeof(array)/sizeof(char*) ? array[i] : "unknown") | 54 | #define STRM(array,i) (i < sizeof(array)/sizeof(char*) ? array[i] : "unknown") |
54 | 55 | ||
55 | #define tveeprom_info(fmt, arg...) do {\ | 56 | #define tveeprom_info(fmt, arg...) \ |
56 | printk(KERN_INFO "tveeprom %d-%04x: " fmt, \ | 57 | v4l_printk(KERN_INFO, "tveeprom", c->adapter, c->addr, fmt , ## arg) |
57 | c->adapter->nr, c->addr , ##arg); } while (0) | 58 | #define tveeprom_warn(fmt, arg...) \ |
58 | #define tveeprom_warn(fmt, arg...) do {\ | 59 | v4l_printk(KERN_WARNING, "tveeprom", c->adapter, c->addr, fmt , ## arg) |
59 | printk(KERN_WARNING "tveeprom %d-%04x: " fmt, \ | 60 | #define tveeprom_dbg(fmt, arg...) do { \ |
60 | c->adapter->nr, c->addr , ##arg); } while (0) | ||
61 | #define tveeprom_dbg(fmt, arg...) do {\ | ||
62 | if (debug) \ | 61 | if (debug) \ |
63 | printk(KERN_INFO "tveeprom %d-%04x: " fmt, \ | 62 | v4l_printk(KERN_DEBUG, "tveeprom", c->adapter, c->addr, fmt , ## arg); \ |
64 | c->adapter->nr, c->addr , ##arg); } while (0) | 63 | } while (0) |
65 | 64 | ||
66 | /* | 65 | /* |
67 | * The Hauppauge eeprom uses an 8bit field to determine which | 66 | * The Hauppauge eeprom uses an 8bit field to determine which |