V4L/DVB (3865): Convert or51132 to refactored tuner code

Convert to tuner_ops calls.
Remove pll function pointers from structure.
Remove dvb-pll code - done elsewhere now.

Signed-off-by: Andrew de Quincey <adq_dvb@lidskialf.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

diff --git a/drivers/media/dvb/frontends/or51132.c b/drivers/media/dvb/frontends/or51132.c
index c25ec73440e73314648d0824259da50163e5cfa8..19f75e6ed82920685d793e2f5de58e3579b65174 100644 (file)
--- a/drivers/media/dvb/frontends/or51132.c
+++ b/drivers/media/dvb/frontends/or51132.c
@@ -331,7 +331,6 @@ static int or51132_set_parameters(struct dvb_frontend* fe,
                                  struct dvb_frontend_parameters *param)
 {
        int ret;
-       u8 buf[4];
        struct or51132_state* state = fe->demodulator_priv;
        const struct firmware *fw;
        const char *fwname;
@@ -384,13 +383,10 @@ static int or51132_set_parameters(struct dvb_frontend* fe,
                or51132_setmode(fe);
        }
 
-       dvb_pll_configure(state->config->pll_desc, buf,
-                         param->frequency, 0);
-       dprintk("set_parameters tuner bytes: 0x%02x 0x%02x "
-               "0x%02x 0x%02x\n",buf[0],buf[1],buf[2],buf[3]);
-       if (i2c_writebytes(state, state->config->pll_address, buf, 4))
-               printk(KERN_WARNING "or51132: set_parameters error "
-                      "writing to tuner\n");
+       if (fe->ops->tuner_ops.set_params) {
+               fe->ops->tuner_ops.set_params(fe, param);
+               if (fe->ops->i2c_gate_ctrl) fe->ops->i2c_gate_ctrl(fe, 0);
+       }
 
        /* Set to current mode */
        or51132_setmode(fe);

diff --git a/drivers/media/dvb/frontends/or51132.h b/drivers/media/dvb/frontends/or51132.h
index 622cdd18381b9e40ecc887cf2d3517d53b4fda1b..89658883abf5eb65a241b9b8f14bd024f8a9738d 100644 (file)
--- a/drivers/media/dvb/frontends/or51132.h
+++ b/drivers/media/dvb/frontends/or51132.h
@@ -29,8 +29,6 @@ struct or51132_config
 {
        /* The demodulator's i2c address */
        u8 demod_address;
-       u8 pll_address;
-       struct dvb_pll_desc *pll_desc;
 
        /* Need to set device param for start_dma */
        int (*set_ts_params)(struct dvb_frontend* fe, int is_punctured);