diff options
Diffstat (limited to 'drivers/media/video/tuner-core.c')
-rw-r--r-- | drivers/media/video/tuner-core.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/drivers/media/video/tuner-core.c b/drivers/media/video/tuner-core.c index fd18a882668..a727c3ae62c 100644 --- a/drivers/media/video/tuner-core.c +++ b/drivers/media/video/tuner-core.c | |||
@@ -23,8 +23,6 @@ | |||
23 | #include <media/v4l2-common.h> | 23 | #include <media/v4l2-common.h> |
24 | #include <media/audiochip.h> | 24 | #include <media/audiochip.h> |
25 | 25 | ||
26 | #include "msp3400.h" | ||
27 | |||
28 | #define UNSET (-1U) | 26 | #define UNSET (-1U) |
29 | 27 | ||
30 | /* standard i2c insmod options */ | 28 | /* standard i2c insmod options */ |
@@ -43,7 +41,8 @@ static unsigned int no_autodetect = 0; | |||
43 | static unsigned int show_i2c = 0; | 41 | static unsigned int show_i2c = 0; |
44 | 42 | ||
45 | /* insmod options used at runtime => read/write */ | 43 | /* insmod options used at runtime => read/write */ |
46 | unsigned int tuner_debug = 0; | 44 | static unsigned int tuner_debug = 0; |
45 | int debug = 0; | ||
47 | 46 | ||
48 | static unsigned int tv_range[2] = { 44, 958 }; | 47 | static unsigned int tv_range[2] = { 44, 958 }; |
49 | static unsigned int radio_range[2] = { 65, 108 }; | 48 | static unsigned int radio_range[2] = { 65, 108 }; |
@@ -55,7 +54,9 @@ static char ntsc[] = "-"; | |||
55 | module_param(addr, int, 0444); | 54 | module_param(addr, int, 0444); |
56 | module_param(no_autodetect, int, 0444); | 55 | module_param(no_autodetect, int, 0444); |
57 | module_param(show_i2c, int, 0444); | 56 | module_param(show_i2c, int, 0444); |
58 | module_param(tuner_debug, int, 0644); | 57 | /* Note: tuner_debug is deprecated and will be removed in 2.6.17 */ |
58 | module_param(tuner_debug, int, 0444); | ||
59 | module_param(debug, int, 0644); | ||
59 | 60 | ||
60 | module_param_string(pal, pal, sizeof(pal), 0644); | 61 | module_param_string(pal, pal, sizeof(pal), 0644); |
61 | module_param_string(secam, secam, sizeof(secam), 0644); | 62 | module_param_string(secam, secam, sizeof(secam), 0644); |
@@ -419,6 +420,11 @@ static int tuner_attach(struct i2c_adapter *adap, int addr, int kind) | |||
419 | t->radio_if2 = 10700 * 1000; /* 10.7MHz - FM radio */ | 420 | t->radio_if2 = 10700 * 1000; /* 10.7MHz - FM radio */ |
420 | t->audmode = V4L2_TUNER_MODE_STEREO; | 421 | t->audmode = V4L2_TUNER_MODE_STEREO; |
421 | t->mode_mask = T_UNINITIALIZED; | 422 | t->mode_mask = T_UNINITIALIZED; |
423 | if (tuner_debug) { | ||
424 | debug = tuner_debug; | ||
425 | printk(KERN_ERR "tuner: tuner_debug is deprecated and will be removed in 2.6.17.\n"); | ||
426 | printk(KERN_ERR "tuner: use the debug option instead.\n"); | ||
427 | } | ||
422 | 428 | ||
423 | if (show_i2c) { | 429 | if (show_i2c) { |
424 | unsigned char buffer[16]; | 430 | unsigned char buffer[16]; |
@@ -546,7 +552,7 @@ static int tuner_command(struct i2c_client *client, unsigned int cmd, void *arg) | |||
546 | { | 552 | { |
547 | struct tuner *t = i2c_get_clientdata(client); | 553 | struct tuner *t = i2c_get_clientdata(client); |
548 | 554 | ||
549 | if (tuner_debug>1) | 555 | if (debug>1) |
550 | v4l_i2c_print_ioctl(&(t->i2c),cmd); | 556 | v4l_i2c_print_ioctl(&(t->i2c),cmd); |
551 | 557 | ||
552 | switch (cmd) { | 558 | switch (cmd) { |