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

Commit 865dd115 authored by Michael Krufky's avatar Michael Krufky Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (5778): Dvb-usb: kill unused tuner/i2c functions 



These two functions are no longer being used:
	dvb_usb_tuner_init_i2c
	dvb_usb_tuner_set_params_i2c

This functionality has been taken over by dvb-pll

Signed-off-by: default avatarMichael Krufky <mkrufky@linuxtv.org>
Signed-off-by: default avatarPatrick Boettcher <pb@linuxtv.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 4ce15678

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

+0 −59
Original line number Diff line number Diff line
@@ -46,62 +46,3 @@ int dvb_usb_i2c_exit(struct dvb_usb_device *d) 
	d->state &= ~DVB_USB_STATE_I2C;

	return 0;

}
 


int dvb_usb_tuner_init_i2c(struct dvb_frontend *fe)

{

	struct dvb_usb_adapter *adap = fe->dvb->priv;

	struct i2c_msg msg = { .addr = adap->pll_addr, .flags = 0, .buf = adap->pll_init, .len = 4 };

	int ret = 0;



	/* if pll_desc is not used */

	if (adap->pll_desc == NULL)

		return 0;



	if (adap->tuner_pass_ctrl)

		adap->tuner_pass_ctrl(fe, 1, adap->pll_addr);



	deb_pll("pll init: %x\n",adap->pll_addr);

	deb_pll("pll-buf: %x %x %x %x\n",adap->pll_init[0], adap->pll_init[1],

			adap->pll_init[2], adap->pll_init[3]);



	if (fe->ops.i2c_gate_ctrl)

		fe->ops.i2c_gate_ctrl(fe, 1);

	if (i2c_transfer (&adap->dev->i2c_adap, &msg, 1) != 1) {

		err("tuner i2c write failed for pll_init.");

		ret = -EREMOTEIO;

	}

	msleep(1);



	if (adap->tuner_pass_ctrl)

		adap->tuner_pass_ctrl(fe,0,adap->pll_addr);

	return ret;

}

EXPORT_SYMBOL(dvb_usb_tuner_init_i2c);



int dvb_usb_tuner_set_params_i2c(struct dvb_frontend *fe, struct dvb_frontend_parameters *fep)

{

	struct dvb_usb_adapter *adap = fe->dvb->priv;

	int ret = 0;

	u8 b[5];

	struct i2c_msg msg = { .addr = adap->pll_addr, .flags = 0, .buf = &b[1], .len = 4 };



	fe->ops.tuner_ops.calc_regs(fe, fep, b, sizeof(b));



	if (adap->tuner_pass_ctrl)

		adap->tuner_pass_ctrl(fe, 1, adap->pll_addr);



	if (fe->ops.i2c_gate_ctrl)

		fe->ops.i2c_gate_ctrl(fe, 1);



	if (i2c_transfer(&adap->dev->i2c_adap, &msg, 1) != 1) {

		err("tuner i2c write failed for pll_set.");

		ret = -EREMOTEIO;

	}

	msleep(1);



	if (adap->tuner_pass_ctrl)

		adap->tuner_pass_ctrl(fe, 0, adap->pll_addr);



	return ret;

}

EXPORT_SYMBOL(dvb_usb_tuner_set_params_i2c);

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

+0 −8
Original line number Diff line number Diff line
@@ -297,10 +297,6 @@ struct dvb_usb_adapter { 
	int feedcount;

	int pid_filtering;



	/* tuner programming information */

	u8 pll_addr;

	u8 pll_init[4];

	struct dvb_pll_desc *pll_desc;

	int (*tuner_pass_ctrl) (struct dvb_frontend *, int, u8);



	/* dvb */
@@ -388,10 +384,6 @@ extern int dvb_usb_generic_write(struct dvb_usb_device *, u8 *, u16); 
/* commonly used remote control parsing */

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_set_params_i2c(struct dvb_frontend *, struct dvb_frontend_parameters *);



/* commonly used firmware download types and function */

struct hexline {

	u8 len;