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>
diff --git a/include/media/tuner.h b/include/media/tuner.h
index 6a8ef18..584f3ab 100644
--- a/include/media/tuner.h
+++ b/include/media/tuner.h
@@ -202,7 +202,6 @@
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 @@
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 c5ca993..51cdca8 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)