瀏覽代碼

V4L/DVB (3861): Convert mt352 to refactored tuner code

Convert to tuner_ops calls.
Remove pll function pointer from structure.
Use standardised pllbuf function.

Signed-off-by: Andrew de Quincey <adq_dvb@lidskialf.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Andrew de Quincey 19 年之前
父節點
當前提交
d1544ecb3b
共有 2 個文件被更改,包括 5 次插入8 次删除
  1. 5 2
      drivers/media/dvb/frontends/mt352.c
  2. 0 6
      drivers/media/dvb/frontends/mt352.h

+ 5 - 2
drivers/media/dvb/frontends/mt352.c

@@ -286,9 +286,12 @@ static int mt352_set_parameters(struct dvb_frontend* fe,
 
 
 	mt352_calc_nominal_rate(state, op->bandwidth, buf+4);
 	mt352_calc_nominal_rate(state, op->bandwidth, buf+4);
 	mt352_calc_input_freq(state, buf+6);
 	mt352_calc_input_freq(state, buf+6);
-	state->config.pll_set(fe, param, buf+8);
 
 
-	mt352_write(fe, buf, sizeof(buf));
+	if (fe->ops->tuner_ops.pllbuf) {
+		fe->ops->tuner_ops.pllbuf(fe, param, buf+8, 5);
+		buf[8] <<= 1;
+		mt352_write(fe, buf, sizeof(buf));
+	}
 	if (state->config.no_tuner) {
 	if (state->config.no_tuner) {
 		/* start decoding */
 		/* start decoding */
 		mt352_write(fe, fsm_go, 2);
 		mt352_write(fe, fsm_go, 2);

+ 0 - 6
drivers/media/dvb/frontends/mt352.h

@@ -49,12 +49,6 @@ struct mt352_config
 
 
 	/* Initialise the demodulator and PLL. Cannot be NULL */
 	/* Initialise the demodulator and PLL. Cannot be NULL */
 	int (*demod_init)(struct dvb_frontend* fe);
 	int (*demod_init)(struct dvb_frontend* fe);
-
-	/* PLL setup - fill out the supplied 5 byte buffer with your PLL settings.
-	 * byte0: Set to pll i2c address (nonlinux; left shifted by 1)
-	 * byte1-4: PLL configuration.
-	 */
-	int (*pll_set)(struct dvb_frontend* fe, struct dvb_frontend_parameters* params, u8* pllbuf);
 };
 };
 
 
 extern struct dvb_frontend* mt352_attach(const struct mt352_config* config,
 extern struct dvb_frontend* mt352_attach(const struct mt352_config* config,