summaryrefslogtreecommitdiffstats
path: root/include/media
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2006-01-09 15:32:40 -0200
committerMauro Carvalho Chehab <mchehab@brturbo.com.br>2006-01-09 15:32:40 -0200
commitfac9e89999a12f378112fe93764b30196bc03f46 (patch)
tree6daf5fee44efe3d878358d17fa9934139d0c7ade /include/media
parent0e7072ef6623c3dc58faf3f7310aba77b0a5845e (diff)
downloadlinux-fac9e89999a12f378112fe93764b30196bc03f46.tar.gz
linux-fac9e89999a12f378112fe93764b30196bc03f46.tar.bz2
linux-fac9e89999a12f378112fe93764b30196bc03f46.zip
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 'include/media')
-rw-r--r--include/media/tuner.h4
-rw-r--r--include/media/v4l2-common.h1
2 files changed, 3 insertions, 2 deletions
diff --git a/include/media/tuner.h b/include/media/tuner.h
index 6a8ef189e5fa..584f3ab1fcf7 100644
--- a/include/media/tuner.h
+++ b/include/media/tuner.h
@@ -202,7 +202,6 @@ struct tuner {
void (*standby)(struct i2c_client *c);
};
-extern unsigned int tuner_debug;
extern unsigned const int tuner_count;
extern int microtune_init(struct i2c_client *c);
@@ -220,7 +219,8 @@ extern int tea5767_autodetection(struct i2c_client *c);
printk(KERN_INFO "%s %d-%04x: " fmt, t->i2c.driver->driver.name, \
i2c_adapter_id(t->i2c.adapter), t->i2c.addr , ##arg); } while (0)
#define tuner_dbg(fmt, arg...) do {\
- if (tuner_debug) \
+ extern int debug; \
+ if (debug) \
printk(KERN_DEBUG "%s %d-%04x: " fmt, t->i2c.driver->driver.name, \
i2c_adapter_id(t->i2c.adapter), t->i2c.addr , ##arg); } while (0)
diff --git a/include/media/v4l2-common.h b/include/media/v4l2-common.h
index c5ca993679ec..51cdca8365c9 100644
--- a/include/media/v4l2-common.h
+++ b/include/media/v4l2-common.h
@@ -51,6 +51,7 @@
parameter called 'debug'. */
#define v4l_dbg(level, client, fmt, arg...) \
do { \
+ extern int debug; \
if (debug >= (level)) \
v4l_client_printk(KERN_DEBUG, client, fmt , ## arg); \
} while (0)