Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bd4956b8 authored by Andrew de Quincey's avatar Andrew de Quincey Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (3893): Convert calls from _pllbuf() to _calc_reg() 



Johannes Stezenbach suggested this change - definite improvement.

Signed-off-by: default avatarAndrew de Quincey <adq_dvb@lidskialf.net>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent b12faeff

drivers/media/dvb/bt8xx/dvb-bt8xx.c

+6 −6
Original line number Diff line number Diff line
@@ -147,7 +147,7 @@ static int thomson_dtt7579_demod_init(struct dvb_frontend* fe) 
	return 0;

}



static int thomson_dtt7579_tuner_pllbuf(struct dvb_frontend* fe, struct dvb_frontend_parameters* params, u8* pllbuf, int buf_len)

static int thomson_dtt7579_tuner_calc_regs(struct dvb_frontend* fe, struct dvb_frontend_parameters* params, u8* pllbuf, int buf_len)

{

	u32 div;

	unsigned char bs = 0;
@@ -341,7 +341,7 @@ static int advbt771_samsung_tdtc9251dh0_demod_init(struct dvb_frontend* fe) 
	return 0;

}



static int advbt771_samsung_tdtc9251dh0_tuner_pllbuf(struct dvb_frontend* fe, struct dvb_frontend_parameters* params, u8* pllbuf, int buf_len)

static int advbt771_samsung_tdtc9251dh0_tuner_calc_regs(struct dvb_frontend* fe, struct dvb_frontend_parameters* params, u8* pllbuf, int buf_len)

{

	u32 div;

	unsigned char bs = 0;
@@ -512,7 +512,7 @@ static int digitv_alps_tded4_demod_init(struct dvb_frontend* fe) 
	return 0;

}



static int digitv_alps_tded4_tuner_pllbuf(struct dvb_frontend* fe, struct dvb_frontend_parameters* params, u8* pllbuf, int buf_len)

static int digitv_alps_tded4_tuner_calc_regs(struct dvb_frontend* fe, struct dvb_frontend_parameters* params, u8* pllbuf, int buf_len)

{

	u32 div;

	struct dvb_ofdm_parameters *op = &params->u.ofdm;
@@ -607,7 +607,7 @@ static void frontend_init(struct dvb_bt8xx_card *card, u32 type) 
						  card->i2c_adapter);



		if (card->fe != NULL) {

			card->fe->ops->tuner_ops.pllbuf = thomson_dtt7579_tuner_pllbuf;

			card->fe->ops->tuner_ops.calc_regs = thomson_dtt7579_tuner_calc_regs;

			card->fe->ops->info.frequency_min = 174000000;

			card->fe->ops->info.frequency_max = 862000000;

		}
@@ -642,7 +642,7 @@ static void frontend_init(struct dvb_bt8xx_card *card, u32 type) 
		card->fe = mt352_attach(&digitv_alps_tded4_config, card->i2c_adapter);



		if (card->fe != NULL) {

			card->fe->ops->tuner_ops.pllbuf = digitv_alps_tded4_tuner_pllbuf;

			card->fe->ops->tuner_ops.calc_regs = digitv_alps_tded4_tuner_calc_regs;

			dprintk ("dvb_bt8xx: an mt352 was detected on your digitv card\n");

		}

		break;
@@ -657,7 +657,7 @@ static void frontend_init(struct dvb_bt8xx_card *card, u32 type) 
	case BTTV_BOARD_AVDVBT_771:

		card->fe = mt352_attach(&advbt771_samsung_tdtc9251dh0_config, card->i2c_adapter);

		if (card->fe != NULL) {

			card->fe->ops->tuner_ops.pllbuf = advbt771_samsung_tdtc9251dh0_tuner_pllbuf;

			card->fe->ops->tuner_ops.calc_regs = advbt771_samsung_tdtc9251dh0_tuner_calc_regs;

			card->fe->ops->info.frequency_min = 174000000;

			card->fe->ops->info.frequency_max = 862000000;

		}

drivers/media/dvb/dvb-usb/cxusb.c

+2 −2
Original line number Diff line number Diff line
@@ -423,7 +423,7 @@ static int cxusb_mt352_frontend_attach(struct dvb_usb_device *d) 
	cxusb_ctrl_msg(d,CMD_DIGITAL, NULL, 0, NULL, 0);



	if ((d->fe = mt352_attach(&cxusb_mt352_config, &d->i2c_adap)) != NULL) {

		d->fe->ops->tuner_ops.pllbuf = dvb_usb_tuner_pllbuf;

		d->fe->ops->tuner_ops.calc_regs = dvb_usb_tuner_calc_regs;

		return 0;

	}
@@ -438,7 +438,7 @@ static int cxusb_dee1601_frontend_attach(struct dvb_usb_device *d) 
	cxusb_ctrl_msg(d,CMD_DIGITAL, NULL, 0, NULL, 0);



	if ((d->fe = mt352_attach(&cxusb_dee1601_config, &d->i2c_adap)) != NULL) {

		d->fe->ops->tuner_ops.pllbuf = dvb_usb_tuner_pllbuf;

		d->fe->ops->tuner_ops.calc_regs = dvb_usb_tuner_calc_regs;

		return 0;

	}

drivers/media/dvb/dvb-usb/digitv.c

+2 −2
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ static int digitv_nxt6000_tuner_set_params(struct dvb_frontend *fe, struct dvb_f 
{

	struct dvb_usb_device *d = fe->dvb->priv;

	u8 b[5];

	dvb_usb_tuner_pllbuf(fe,fep,b, 5);

	dvb_usb_tuner_calc_regs(fe,fep,b, 5);

	return digitv_ctrl_msg(d,USB_WRITE_TUNER,0,&b[1],4,NULL,0);

}
@@ -129,7 +129,7 @@ static struct nxt6000_config digitv_nxt6000_config = { 
static int digitv_frontend_attach(struct dvb_usb_device *d)

{

	if ((d->fe = mt352_attach(&digitv_mt352_config, &d->i2c_adap)) != NULL) {

		d->fe->ops->tuner_ops.pllbuf = dvb_usb_tuner_pllbuf;

		d->fe->ops->tuner_ops.calc_regs = dvb_usb_tuner_calc_regs;

		return 0;

	}

	if ((d->fe = nxt6000_attach(&digitv_nxt6000_config, &d->i2c_adap)) != NULL) {

drivers/media/dvb/dvb-usb/dvb-usb.h

+1 −1
Original line number Diff line number Diff line
@@ -331,7 +331,7 @@ extern int dvb_usb_nec_rc_key_to_event(struct dvb_usb_device *, u8[], u32 *, int 


/* commonly used pll init and set functions */

extern int dvb_usb_tuner_init_i2c(struct dvb_frontend *);

extern int dvb_usb_tuner_pllbuf(struct dvb_frontend *, struct dvb_frontend_parameters *, u8 *buf, int buf_len);

extern int dvb_usb_tuner_calc_regs(struct dvb_frontend *, struct dvb_frontend_parameters *, u8 *buf, int buf_len);

extern int dvb_usb_tuner_set_params_i2c(struct dvb_frontend *, struct dvb_frontend_parameters *);



/* commonly used firmware download types and function */

drivers/media/dvb/dvb-usb/umt-010.c

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ static int umt_mt352_frontend_attach(struct dvb_usb_device *d) 
	memset(&umt_config,0,sizeof(struct mt352_config));

	umt_config.demod_init = umt_mt352_demod_init;

	umt_config.demod_address = 0xf;

	d->fe->ops->tuner_ops.pllbuf = dvb_usb_tuner_pllbuf;

	d->fe->ops->tuner_ops.calc_regs = dvb_usb_tuner_calc_regs;



	d->fe = mt352_attach(&umt_config, &d->i2c_adap);