---

yaml
---
r: 29899
b: refs/heads/master
c: e994b8d
h: refs/heads/master
i:
  29897: 955ec15
  29895: 46432b1
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 605ee41c432e550a4e6a4f6fd82013b2989e36a3
+refs/heads/master: e994b8d97807536a0f02cff87058d284b29810b7

trunk/drivers/media/dvb/frontends/zl10353.c

@@ -125,7 +125,6 @@ static int zl10353_sleep(struct dvb_frontend *fe)
 static int zl10353_set_parameters(struct dvb_frontend *fe,
 				  struct dvb_frontend_parameters *param)
 {
-	struct zl10353_state *state = fe->demodulator_priv;
 	u8 pllbuf[6] = { 0x67 };
 
 	/* These settings set "auto-everything" and start the FSM. */
@@ -142,8 +141,11 @@ static int zl10353_set_parameters(struct dvb_frontend *fe,
 	zl10353_single_write(fe, 0x66, 0xE9);
 	zl10353_single_write(fe, 0x62, 0x0A);
 
-	state->config.pll_set(fe, param, pllbuf + 1);
-	zl10353_write(fe, pllbuf, sizeof(pllbuf));
+	if (fe->ops->tuner_ops.pllbuf) {
+		fe->ops->tuner_ops.pllbuf(fe, param, pllbuf+1, 5);
+		pllbuf[1] <<= 1;
+		zl10353_write(fe, pllbuf, sizeof(pllbuf));
+	}
 
 	zl10353_single_write(fe, 0x70, 0x01);
 	udelay(250);

trunk/drivers/media/dvb/frontends/zl10353.h

@@ -28,11 +28,6 @@ struct zl10353_config
 {
 	/* demodulator's I2C address */
 	u8 demod_address;
-
-	/* function which configures the PLL buffer (for secondary I2C
-	 * connected tuner) or tunes the PLL (for direct connected tuner) */
-	int (*pll_set)(struct dvb_frontend *fe,
-		       struct dvb_frontend_parameters *params, u8 *pllbuf);
 };
 
 extern struct dvb_frontend* zl10353_attach(const struct zl10353_config *config,