From 632f4298b8f361925ed848c6117f0e1f57bd4f00 Mon Sep 17 00:00:00 2001 From: Michael Krufky Date: Mon, 21 Jan 2008 08:55:37 -0500 Subject: make tuner names consistent with standard cases From: Michael Krufky Change TDA9887 to tda9887. TDA8290 shall reflect the actual hardware present in its name, ie: tda8295+18271 tda8290+8275a Signed-off-by: Michael Krufky --- linux/drivers/media/video/tda8290.c | 8 ++------ linux/drivers/media/video/tda9887.c | 2 +- 2 files changed, 3 insertions(+), 7 deletions(-) (limited to 'linux') diff --git a/linux/drivers/media/video/tda8290.c b/linux/drivers/media/video/tda8290.c index 31bd84600..1bda0024b 100644 --- a/linux/drivers/media/video/tda8290.c +++ b/linux/drivers/media/video/tda8290.c @@ -671,9 +671,6 @@ static int tda8295_probe(struct tuner_i2c_props *i2c_props) } static struct analog_demod_ops tda8290_ops = { - .info = { - .name = "TDA8290", - }, .set_params = tda8290_set_params, .has_signal = tda8290_has_signal, .standby = tda8290_standby, @@ -682,9 +679,6 @@ static struct analog_demod_ops tda8290_ops = { }; static struct analog_demod_ops tda8295_ops = { - .info = { - .name = "TDA8295", - }, .set_params = tda8295_set_params, .has_signal = tda8295_has_signal, .standby = tda8295_standby, @@ -757,6 +751,8 @@ struct dvb_frontend *tda829x_attach(struct dvb_frontend *fe, } tuner_info("type set to %s\n", name); + fe->ops.analog_ops.info.name = name; + if (priv->ver & TDA8290) { tda8290_init_tuner(fe); tda8290_init_if(fe); diff --git a/linux/drivers/media/video/tda9887.c b/linux/drivers/media/video/tda9887.c index 5962e39c3..fda15da1f 100644 --- a/linux/drivers/media/video/tda9887.c +++ b/linux/drivers/media/video/tda9887.c @@ -661,7 +661,7 @@ static void tda9887_release(struct dvb_frontend *fe) static struct analog_demod_ops tda9887_ops = { .info = { - .name = "TDA9887", + .name = "tda9887", }, .set_params = tda9887_set_params, .standby = tda9887_standby, -- cgit v1.2.3 From 09729871a743a1ac9a8cc12d1103b5230a49ce28 Mon Sep 17 00:00:00 2001 From: Michael Krufky Date: Mon, 21 Jan 2008 10:01:34 -0500 Subject: tuner: suppress obsolete tuner i2c address warning for XC5000 tuners From: Michael Krufky We already know that the XC5000 tuner can only be located at i2c address 0x61, 0x62, 0x63 or 0x64 We shouldn't display this warning if the XC5000 tuner is present. Signed-off-by: Michael Krufky --- linux/drivers/media/video/tuner-core.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'linux') diff --git a/linux/drivers/media/video/tuner-core.c b/linux/drivers/media/video/tuner-core.c index 6305998e2..99bba6415 100644 --- a/linux/drivers/media/video/tuner-core.c +++ b/linux/drivers/media/video/tuner-core.c @@ -326,6 +326,12 @@ static void tuner_i2c_address_check(struct tuner *t) ((t->i2c->addr < 0x64) || (t->i2c->addr > 0x6f))) return; + /* We already know that the XC5000 can only be located at + * i2c address 0x61, 0x62, 0x63 or 0x64 */ + if ((t->type == TUNER_XC5000) && + ((t->i2c->addr <= 0x64)) && (t->i2c->addr >= 0x61)) + return; + tuner_warn("====================== WARNING! ======================\n"); tuner_warn("Support for tuners in i2c address range 0x64 thru 0x6f\n"); tuner_warn("will soon be dropped. This message indicates that your\n"); -- cgit v1.2.3