aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew de Quincey <adq_dvb@lidskialf.net>2006-04-18 16:47:11 -0400
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-06-25 00:58:54 -0400
commite994b8d97807536a0f02cff87058d284b29810b7 (patch)
treece0a5d8362fd1534f04a9b1cf6518780161de3d7
parent605ee41c432e550a4e6a4f6fd82013b2989e36a3 (diff)
V4L/DVB (3868): Convert zl10353 to refactored tuner code
Convert to tuner_ops calls. Remove pll function pointers from structure. Use standardised pllbuf call. Signed-off-by: Andrew de Quincey <adq_dvb@lidskialf.net> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
-rw-r--r--drivers/media/dvb/frontends/zl10353.c8
-rw-r--r--drivers/media/dvb/frontends/zl10353.h5
2 files changed, 5 insertions, 8 deletions
diff --git a/drivers/media/dvb/frontends/zl10353.c b/drivers/media/dvb/frontends/zl10353.c
index d7d9f59d76d2..73fe40b50fc4 100644
--- a/drivers/media/dvb/frontends/zl10353.c
+++ b/drivers/media/dvb/frontends/zl10353.c
@@ -125,7 +125,6 @@ static int zl10353_sleep(struct dvb_frontend *fe)
125static int zl10353_set_parameters(struct dvb_frontend *fe, 125static int zl10353_set_parameters(struct dvb_frontend *fe,
126 struct dvb_frontend_parameters *param) 126 struct dvb_frontend_parameters *param)
127{ 127{
128 struct zl10353_state *state = fe->demodulator_priv;
129 u8 pllbuf[6] = { 0x67 }; 128 u8 pllbuf[6] = { 0x67 };
130 129
131 /* These settings set "auto-everything" and start the FSM. */ 130 /* These settings set "auto-everything" and start the FSM. */
@@ -142,8 +141,11 @@ static int zl10353_set_parameters(struct dvb_frontend *fe,
142 zl10353_single_write(fe, 0x66, 0xE9); 141 zl10353_single_write(fe, 0x66, 0xE9);
143 zl10353_single_write(fe, 0x62, 0x0A); 142 zl10353_single_write(fe, 0x62, 0x0A);
144 143
145 state->config.pll_set(fe, param, pllbuf + 1); 144 if (fe->ops->tuner_ops.pllbuf) {
146 zl10353_write(fe, pllbuf, sizeof(pllbuf)); 145 fe->ops->tuner_ops.pllbuf(fe, param, pllbuf+1, 5);
146 pllbuf[1] <<= 1;
147 zl10353_write(fe, pllbuf, sizeof(pllbuf));
148 }
147 149
148 zl10353_single_write(fe, 0x70, 0x01); 150 zl10353_single_write(fe, 0x70, 0x01);
149 udelay(250); 151 udelay(250);
diff --git a/drivers/media/dvb/frontends/zl10353.h b/drivers/media/dvb/frontends/zl10353.h
index 5cc4ae718d8c..63c36ec02adf 100644
--- a/drivers/media/dvb/frontends/zl10353.h
+++ b/drivers/media/dvb/frontends/zl10353.h
@@ -28,11 +28,6 @@ struct zl10353_config
28{ 28{
29 /* demodulator's I2C address */ 29 /* demodulator's I2C address */
30 u8 demod_address; 30 u8 demod_address;
31
32 /* function which configures the PLL buffer (for secondary I2C
33 * connected tuner) or tunes the PLL (for direct connected tuner) */
34 int (*pll_set)(struct dvb_frontend *fe,
35 struct dvb_frontend_parameters *params, u8 *pllbuf);
36}; 31};
37 32
38extern struct dvb_frontend* zl10353_attach(const struct zl10353_config *config, 33extern struct dvb_frontend* zl10353_attach(const struct zl10353_config *config,