Эх сурвалжийг харах

V4L/DVB (3860): Convert l64871 to refactored tuner code

Convert to tuner_ops calls.
Remove pll function pointers from structure.
Remove unneeded tuner calls.

Signed-off-by: Andrew de Quincey <adq_dvb@lidskialf.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Andrew de Quincey 19 жил өмнө
parent
commit
b800aae382

+ 4 - 3
drivers/media/dvb/frontends/l64781.c

@@ -141,7 +141,10 @@ static int apply_frontend_param (struct dvb_frontend* fe, struct dvb_frontend_pa
 	u8 val0x06;
 	u8 val0x06;
 	int bw = p->bandwidth - BANDWIDTH_8_MHZ;
 	int bw = p->bandwidth - BANDWIDTH_8_MHZ;
 
 
-	state->config->pll_set(fe, param);
+	if (fe->ops->tuner_ops.set_params) {
+		fe->ops->tuner_ops.set_params(fe, param);
+		if (fe->ops->i2c_gate_ctrl) fe->ops->i2c_gate_ctrl(fe, 0);
+	}
 
 
 	if (param->inversion != INVERSION_ON &&
 	if (param->inversion != INVERSION_ON &&
 	    param->inversion != INVERSION_OFF)
 	    param->inversion != INVERSION_OFF)
@@ -463,8 +466,6 @@ static int l64781_init(struct dvb_frontend* fe)
 	/* Everything is two's complement, soft bit and CSI_OUT too */
 	/* Everything is two's complement, soft bit and CSI_OUT too */
 	l64781_writereg (state, 0x1e, 0x09);
 	l64781_writereg (state, 0x1e, 0x09);
 
 
-	if (state->config->pll_init) state->config->pll_init(fe);
-
 	/* delay a bit after first init attempt */
 	/* delay a bit after first init attempt */
 	if (state->first) {
 	if (state->first) {
 		state->first = 0;
 		state->first = 0;

+ 0 - 4
drivers/media/dvb/frontends/l64781.h

@@ -29,10 +29,6 @@ struct l64781_config
 {
 {
 	/* the demodulator's i2c address */
 	/* the demodulator's i2c address */
 	u8 demod_address;
 	u8 demod_address;
-
-	/* PLL maintenance */
-	int (*pll_init)(struct dvb_frontend* fe);
-	int (*pll_set)(struct dvb_frontend* fe, struct dvb_frontend_parameters* params);
 };
 };