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/include/media | |
| 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/include/media')
| -rw-r--r-- | linux/include/media/tuner.h | 6 | ||||
| -rw-r--r-- | linux/include/media/v4l2-common.h | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/linux/include/media/tuner.h b/linux/include/media/tuner.h index c125fd385..2f5f8a1be 100644 --- a/linux/include/media/tuner.h +++ b/linux/include/media/tuner.h @@ -1,5 +1,5 @@ /* - $Id: tuner.h,v 1.70 2006/01/01 17:17:39 mchehab Exp $ + $Id: tuner.h,v 1.71 2006/01/02 22:31:44 hverkuil Exp $ tuner.h - definition for different tuners Copyright (C) 1997 Markus Schroeder (schroedm@uni-duesseldorf.de) @@ -203,7 +203,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->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->name, \ i2c_adapter_id(t->i2c.adapter), t->i2c.addr , ##arg); } while (0) diff --git a/linux/include/media/v4l2-common.h b/linux/include/media/v4l2-common.h index 99eb14c2f..7bfc609e1 100644 --- a/linux/include/media/v4l2-common.h +++ b/linux/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) |