aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/dvb/dvb-usb
diff options
context:
space:
mode:
authorAndrew de Quincey <adq_dvb@lidskialf.net>2006-04-18 20:38:49 -0400
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-06-25 00:59:34 -0400
commitbd4956b8ec2075e965492647e0c7006a36efe5d9 (patch)
tree66d5ebecc0cdc84543cae07ca16a5d1a20aefb90 /drivers/media/dvb/dvb-usb
parentb12faeffb179e5397c7c443b0e86e447891125a6 (diff)
V4L/DVB (3893): Convert calls from _pllbuf() to _calc_reg()
Johannes Stezenbach suggested this change - definite improvement. Signed-off-by: Andrew de Quincey <adq_dvb@lidskialf.net> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/dvb/dvb-usb')
-rw-r--r--drivers/media/dvb/dvb-usb/cxusb.c4
-rw-r--r--drivers/media/dvb/dvb-usb/digitv.c4
-rw-r--r--drivers/media/dvb/dvb-usb/dvb-usb.h2
-rw-r--r--drivers/media/dvb/dvb-usb/umt-010.c2
4 files changed, 6 insertions, 6 deletions
diff --git a/drivers/media/dvb/dvb-usb/cxusb.c b/drivers/media/dvb/dvb-usb/cxusb.c
index 8559c2cd9a45..0f178377d1a6 100644
--- a/drivers/media/dvb/dvb-usb/cxusb.c
+++ b/drivers/media/dvb/dvb-usb/cxusb.c
@@ -423,7 +423,7 @@ static int cxusb_mt352_frontend_attach(struct dvb_usb_device *d)
423 cxusb_ctrl_msg(d,CMD_DIGITAL, NULL, 0, NULL, 0); 423 cxusb_ctrl_msg(d,CMD_DIGITAL, NULL, 0, NULL, 0);
424 424
425 if ((d->fe = mt352_attach(&cxusb_mt352_config, &d->i2c_adap)) != NULL) { 425 if ((d->fe = mt352_attach(&cxusb_mt352_config, &d->i2c_adap)) != NULL) {
426 d->fe->ops->tuner_ops.pllbuf = dvb_usb_tuner_pllbuf; 426 d->fe->ops->tuner_ops.calc_regs = dvb_usb_tuner_calc_regs;
427 return 0; 427 return 0;
428 } 428 }
429 429
@@ -438,7 +438,7 @@ static int cxusb_dee1601_frontend_attach(struct dvb_usb_device *d)
438 cxusb_ctrl_msg(d,CMD_DIGITAL, NULL, 0, NULL, 0); 438 cxusb_ctrl_msg(d,CMD_DIGITAL, NULL, 0, NULL, 0);
439 439
440 if ((d->fe = mt352_attach(&cxusb_dee1601_config, &d->i2c_adap)) != NULL) { 440 if ((d->fe = mt352_attach(&cxusb_dee1601_config, &d->i2c_adap)) != NULL) {
441 d->fe->ops->tuner_ops.pllbuf = dvb_usb_tuner_pllbuf; 441 d->fe->ops->tuner_ops.calc_regs = dvb_usb_tuner_calc_regs;
442 return 0; 442 return 0;
443 } 443 }
444 444
diff --git a/drivers/media/dvb/dvb-usb/digitv.c b/drivers/media/dvb/dvb-usb/digitv.c
index 481f48b9d846..56814ba8037b 100644
--- a/drivers/media/dvb/dvb-usb/digitv.c
+++ b/drivers/media/dvb/dvb-usb/digitv.c
@@ -118,7 +118,7 @@ static int digitv_nxt6000_tuner_set_params(struct dvb_frontend *fe, struct dvb_f
118{ 118{
119 struct dvb_usb_device *d = fe->dvb->priv; 119 struct dvb_usb_device *d = fe->dvb->priv;
120 u8 b[5]; 120 u8 b[5];
121 dvb_usb_tuner_pllbuf(fe,fep,b, 5); 121 dvb_usb_tuner_calc_regs(fe,fep,b, 5);
122 return digitv_ctrl_msg(d,USB_WRITE_TUNER,0,&b[1],4,NULL,0); 122 return digitv_ctrl_msg(d,USB_WRITE_TUNER,0,&b[1],4,NULL,0);
123} 123}
124 124
@@ -129,7 +129,7 @@ static struct nxt6000_config digitv_nxt6000_config = {
129static int digitv_frontend_attach(struct dvb_usb_device *d) 129static int digitv_frontend_attach(struct dvb_usb_device *d)
130{ 130{
131 if ((d->fe = mt352_attach(&digitv_mt352_config, &d->i2c_adap)) != NULL) { 131 if ((d->fe = mt352_attach(&digitv_mt352_config, &d->i2c_adap)) != NULL) {
132 d->fe->ops->tuner_ops.pllbuf = dvb_usb_tuner_pllbuf; 132 d->fe->ops->tuner_ops.calc_regs = dvb_usb_tuner_calc_regs;
133 return 0; 133 return 0;
134 } 134 }
135 if ((d->fe = nxt6000_attach(&digitv_nxt6000_config, &d->i2c_adap)) != NULL) { 135 if ((d->fe = nxt6000_attach(&digitv_nxt6000_config, &d->i2c_adap)) != NULL) {
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb.h b/drivers/media/dvb/dvb-usb/dvb-usb.h
index 311acb43e4c8..4cf9f89c51bf 100644
--- a/drivers/media/dvb/dvb-usb/dvb-usb.h
+++ b/drivers/media/dvb/dvb-usb/dvb-usb.h
@@ -331,7 +331,7 @@ extern int dvb_usb_nec_rc_key_to_event(struct dvb_usb_device *, u8[], u32 *, int
331 331
332/* commonly used pll init and set functions */ 332/* commonly used pll init and set functions */
333extern int dvb_usb_tuner_init_i2c(struct dvb_frontend *); 333extern int dvb_usb_tuner_init_i2c(struct dvb_frontend *);
334extern int dvb_usb_tuner_pllbuf(struct dvb_frontend *, struct dvb_frontend_parameters *, u8 *buf, int buf_len); 334extern int dvb_usb_tuner_calc_regs(struct dvb_frontend *, struct dvb_frontend_parameters *, u8 *buf, int buf_len);
335extern int dvb_usb_tuner_set_params_i2c(struct dvb_frontend *, struct dvb_frontend_parameters *); 335extern int dvb_usb_tuner_set_params_i2c(struct dvb_frontend *, struct dvb_frontend_parameters *);
336 336
337/* commonly used firmware download types and function */ 337/* commonly used firmware download types and function */
diff --git a/drivers/media/dvb/dvb-usb/umt-010.c b/drivers/media/dvb/dvb-usb/umt-010.c
index 80538db79fcb..1a38c80acd6c 100644
--- a/drivers/media/dvb/dvb-usb/umt-010.c
+++ b/drivers/media/dvb/dvb-usb/umt-010.c
@@ -57,7 +57,7 @@ static int umt_mt352_frontend_attach(struct dvb_usb_device *d)
57 memset(&umt_config,0,sizeof(struct mt352_config)); 57 memset(&umt_config,0,sizeof(struct mt352_config));
58 umt_config.demod_init = umt_mt352_demod_init; 58 umt_config.demod_init = umt_mt352_demod_init;
59 umt_config.demod_address = 0xf; 59 umt_config.demod_address = 0xf;
60 d->fe->ops->tuner_ops.pllbuf = dvb_usb_tuner_pllbuf; 60 d->fe->ops->tuner_ops.calc_regs = dvb_usb_tuner_calc_regs;
61 61
62 d->fe = mt352_attach(&umt_config, &d->i2c_adap); 62 d->fe = mt352_attach(&umt_config, &d->i2c_adap);
63 63