[media] mt2031: remove fake implementaion of get_bandwidth()

This driver implements a fake get_bandwidth() callback. In
reallity, the tuner driver won't adjust its low-pass
filter based on a bandwidth, and were just providing a fake
method for demods to read whatever was "set".

This code is useless, as none of the drivers that use
this tuner seems to require a get_bandwidth() callback.

While here, convert set_params to use the DVBv5 way to pass
parameters to tuners.

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/common/tuners/mt2131.c b/drivers/media/common/tuners/mt2131.c
index a4f830bb25d1346a8961f15fd477d64023424604..d9cab1ff6dff0ace50dcfecf393c9257a78d2245 100644 (file)
--- a/drivers/media/common/tuners/mt2131.c
+++ b/drivers/media/common/tuners/mt2131.c
@@ -95,6 +95,7 @@ static int mt2131_writeregs(struct mt2131_priv *priv,u8 *buf, u8 len)
 static int mt2131_set_params(struct dvb_frontend *fe,
                             struct dvb_frontend_parameters *params)
 {
+       struct dtv_frontend_properties *c = &fe->dtv_property_cache;
        struct mt2131_priv *priv;
        int ret=0, i;
        u32 freq;
@@ -105,12 +106,8 @@ static int mt2131_set_params(struct dvb_frontend *fe,
        u8 lockval = 0;
 
        priv = fe->tuner_priv;
-       if (fe->ops.info.type == FE_OFDM)
-               priv->bandwidth = params->u.ofdm.bandwidth;
-       else
-               priv->bandwidth = 0;
 
-       freq = params->frequency / 1000;  // Hz -> kHz
+       freq = c->frequency / 1000;  /* Hz -> kHz */
        dprintk(1, "%s() freq=%d\n", __func__, freq);
 
        f_lo1 = freq + MT2131_IF1 * 1000;
@@ -193,14 +190,6 @@ static int mt2131_get_frequency(struct dvb_frontend *fe, u32 *frequency)
        return 0;
 }
 
-static int mt2131_get_bandwidth(struct dvb_frontend *fe, u32 *bandwidth)
-{
-       struct mt2131_priv *priv = fe->tuner_priv;
-       dprintk(1, "%s()\n", __func__);
-       *bandwidth = priv->bandwidth;
-       return 0;
-}
-
 static int mt2131_get_status(struct dvb_frontend *fe, u32 *status)
 {
        struct mt2131_priv *priv = fe->tuner_priv;
@@ -263,7 +252,6 @@ static const struct dvb_tuner_ops mt2131_tuner_ops = {
 
        .set_params    = mt2131_set_params,
        .get_frequency = mt2131_get_frequency,
-       .get_bandwidth = mt2131_get_bandwidth,
        .get_status    = mt2131_get_status
 };
 
@@ -281,7 +269,6 @@ struct dvb_frontend * mt2131_attach(struct dvb_frontend *fe,
                return NULL;
 
        priv->cfg = cfg;
-       priv->bandwidth = 6000000; /* 6MHz */
        priv->i2c = i2c;
 
        if (mt2131_readreg(priv, 0, &id) != 0) {

diff --git a/drivers/media/common/tuners/mt2131_priv.h b/drivers/media/common/tuners/mt2131_priv.h
index 4e05a67e88c1419580fe410450c07bf00c66f8e4..62aeedf5c5503198a606bbff9fe443c780ac288d 100644 (file)
--- a/drivers/media/common/tuners/mt2131_priv.h
+++ b/drivers/media/common/tuners/mt2131_priv.h
@@ -38,7 +38,6 @@ struct mt2131_priv {
        struct i2c_adapter   *i2c;
 
        u32 frequency;
-       u32 bandwidth;
 };
 
 #endif /* __MT2131_PRIV_H__ */