V4L/DVB (3884): Convert dibusb* to refactored tuner code

Hook tuner call into tuner_ops.

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/dvb-usb/dibusb-common.c b/drivers/media/dvb/dvb-usb/dibusb-common.c
index 2d52b76..b0435c8 100644 (file)
--- a/drivers/media/dvb/dvb-usb/dibusb-common.c
+++ b/drivers/media/dvb/dvb-usb/dibusb-common.c
@@ -173,8 +173,8 @@ int dibusb_dib3000mc_frontend_attach(struct dvb_usb_device *d)
        struct dib3000_config demod_cfg;
        struct dibusb_state *st = d->priv;
 
-       demod_cfg.pll_set = dvb_usb_pll_set_i2c;
-       demod_cfg.pll_init = dvb_usb_pll_init_i2c;
+       d->fe->ops->tuner_ops.init = dvb_usb_tuner_init_i2c;
+       d->fe->ops->tuner_ops.set_params = dvb_usb_tuner_set_params_i2c;
 
        for (demod_cfg.demod_address = 0x8; demod_cfg.demod_address < 0xd; demod_cfg.demod_address++)
                if ((d->fe = dib3000mc_attach(&demod_cfg,&d->i2c_adap,&st->ops)) != NULL) {

diff --git a/drivers/media/dvb/dvb-usb/dibusb-mb.c b/drivers/media/dvb/dvb-usb/dibusb-mb.c
index dd5a131..def0c11 100644 (file)
--- a/drivers/media/dvb/dvb-usb/dibusb-mb.c
+++ b/drivers/media/dvb/dvb-usb/dibusb-mb.c
@@ -20,8 +20,8 @@ static int dibusb_dib3000mb_frontend_attach(struct dvb_usb_device *d)
        struct dibusb_state *st = d->priv;
 
        demod_cfg.demod_address = 0x8;
-       demod_cfg.pll_set = dvb_usb_pll_set_i2c;
-       demod_cfg.pll_init = dvb_usb_pll_init_i2c;
+       d->fe->ops->tuner_ops.init = dvb_usb_tuner_init_i2c;
+       d->fe->ops->tuner_ops.set_params = dvb_usb_tuner_set_params_i2c;
 
        if ((d->fe = dib3000mb_attach(&demod_cfg,&d->i2c_adap,&st->ops)) == NULL)
                return -ENODEV;