浏览代码

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>
Andrew de Quincey 19 年之前
父节点
当前提交
a263394b48
共有 2 个文件被更改,包括 4 次插入4 次删除
  1. 2 2
      drivers/media/dvb/dvb-usb/dibusb-common.c
  2. 2 2
      drivers/media/dvb/dvb-usb/dibusb-mb.c

+ 2 - 2
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) {

+ 2 - 2
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;