linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / drivers / media / dvb / frontends / sp887x.c

diff --git a/drivers/media/dvb/frontends/sp887x.c b/drivers/media/dvb/frontends/sp887x.c
index 5c2f8f4..eb8a602 100644 (file)
--- a/drivers/media/dvb/frontends/sp887x.c
+++ b/drivers/media/dvb/frontends/sp887x.c
@@ -24,6 +24,7 @@
 
 struct sp887x_state {
        struct i2c_adapter* i2c;
+       struct dvb_frontend_ops ops;
        const struct sp887x_config* config;
        struct dvb_frontend frontend;
 
@@ -207,6 +208,15 @@ static int sp887x_initial_setup (struct dvb_frontend* fe, const struct firmware
        /* bit 0x010: enable data valid signal */
        sp887x_writereg(state, 0xd00, 0x010);
        sp887x_writereg(state, 0x0d1, 0x000);
+
+       /* setup the PLL */
+       if (state->config->pll_init) {
+               sp887x_writereg(state, 0x206, 0x001);
+               state->config->pll_init(fe);
+               sp887x_writereg(state, 0x206, 0x000);
+       }
+
+       printk ("done.\n");
        return 0;
 };
 
@@ -352,16 +362,9 @@ static int sp887x_setup_frontend_parameters (struct dvb_frontend* fe,
        sp887x_microcontroller_stop(state);
 
        /* setup the PLL */
-       if (fe->ops.tuner_ops.set_params) {
-               fe->ops.tuner_ops.set_params(fe, p);
-               if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 0);
-       }
-       if (fe->ops.tuner_ops.get_frequency) {
-               fe->ops.tuner_ops.get_frequency(fe, &actual_freq);
-               if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 0);
-       } else {
-               actual_freq = p->frequency;
-       }
+       sp887x_writereg(state, 0x206, 0x001);
+       actual_freq = state->config->pll_set(fe, p);
+       sp887x_writereg(state, 0x206, 0x000);
 
        /* read status reg in order to clear <pending irqs */
        sp887x_readreg(state, 0x200);
@@ -483,17 +486,6 @@ static int sp887x_read_ucblocks(struct dvb_frontend* fe, u32* ucblocks)
        return 0;
 }
 
-static int sp887x_i2c_gate_ctrl(struct dvb_frontend* fe, int enable)
-{
-       struct sp887x_state* state = fe->demodulator_priv;
-
-       if (enable) {
-               return sp887x_writereg(state, 0x206, 0x001);
-       } else {
-               return sp887x_writereg(state, 0x206, 0x000);
-       }
-}
-
 static int sp887x_sleep(struct dvb_frontend* fe)
 {
        struct sp887x_state* state = fe->demodulator_priv;
@@ -520,9 +512,9 @@ static int sp887x_init(struct dvb_frontend* fe)
                }
 
                ret = sp887x_initial_setup(fe, fw);
-               release_firmware(fw);
                if (ret) {
                        printk("sp887x: writing firmware to device failed\n");
+                       release_firmware(fw);
                        return ret;
                }
                printk("sp887x: firmware upload complete\n");
@@ -563,13 +555,14 @@ struct dvb_frontend* sp887x_attach(const struct sp887x_config* config,
        /* setup the state */
        state->config = config;
        state->i2c = i2c;
+       memcpy(&state->ops, &sp887x_ops, sizeof(struct dvb_frontend_ops));
        state->initialised = 0;
 
        /* check if the demod is there */
        if (sp887x_readreg(state, 0x0200) < 0) goto error;
 
        /* create dvb_frontend */
-       memcpy(&state->frontend.ops, &sp887x_ops, sizeof(struct dvb_frontend_ops));
+       state->frontend.ops = &state->ops;
        state->frontend.demodulator_priv = state;
        return &state->frontend;
 
@@ -596,7 +589,6 @@ static struct dvb_frontend_ops sp887x_ops = {
 
        .init = sp887x_init,
        .sleep = sp887x_sleep,
-       .i2c_gate_ctrl = sp887x_i2c_gate_ctrl,
 
        .set_frontend = sp887x_setup_frontend_parameters,
        .get_tune_settings = sp887x_get_tune_settings,