Merge branch 'patches_for_v3.6' into v4l_for_linus

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

diff --git a/drivers/media/dvb/frontends/stv090x.c b/drivers/media/dvb/frontends/stv090x.c
index ebda419..ea86a56 100644 (file)
--- a/drivers/media/dvb/frontends/stv090x.c
+++ b/drivers/media/dvb/frontends/stv090x.c
@@ -2842,7 +2842,6 @@ static int stv090x_optimize_track(struct stv090x_state *state)
 {
        struct dvb_frontend *fe = &state->frontend;
 
-       enum stv090x_rolloff rolloff;
        enum stv090x_modcod modcod;
 
        s32 srate, pilots, aclc, f_1, f_0, i = 0, blind_tune = 0;
@@ -2966,7 +2965,6 @@ static int stv090x_optimize_track(struct stv090x_state *state)
        f_1 = STV090x_READ_DEMOD(state, CFR2);
        f_0 = STV090x_READ_DEMOD(state, CFR1);
        reg = STV090x_READ_DEMOD(state, TMGOBS);
-       rolloff = STV090x_GETFIELD_Px(reg, ROLLOFF_STATUS_FIELD);
 
        if (state->algo == STV090x_BLIND_SEARCH) {
                STV090x_WRITE_DEMOD(state, SFRSTEP, 0x00);
@@ -3174,7 +3172,7 @@ static enum stv090x_signal_state stv090x_algo(struct stv090x_state *state)
        enum stv090x_signal_state signal_state = STV090x_NOCARRIER;
        u32 reg;
        s32 agc1_power, power_iq = 0, i;
-       int lock = 0, low_sr = 0, no_signal = 0;
+       int lock = 0, low_sr = 0;
 
        reg = STV090x_READ_DEMOD(state, TSCFGH);
        STV090x_SETFIELD_Px(reg, RST_HWARE_FIELD, 1); /* Stop path 1 stream merger */
@@ -3415,7 +3413,7 @@ static enum stv090x_signal_state stv090x_algo(struct stv090x_state *state)
                                goto err;
                } else {
                        signal_state = STV090x_NODATA;
-                       no_signal = stv090x_chk_signal(state);
+                       stv090x_chk_signal(state);
                }
        }
        return signal_state;
@@ -3427,17 +3425,17 @@ err:
        return -1;
 }
 
-static enum dvbfe_search stv090x_search(struct dvb_frontend *fe, struct dvb_frontend_parameters *p)
+static enum dvbfe_search stv090x_search(struct dvb_frontend *fe)
 {
        struct stv090x_state *state = fe->demodulator_priv;
        struct dtv_frontend_properties *props = &fe->dtv_property_cache;
 
-       if (p->frequency == 0)
+       if (props->frequency == 0)
                return DVBFE_ALGO_SEARCH_INVALID;
 
        state->delsys = props->delivery_system;
-       state->frequency = p->frequency;
-       state->srate = p->u.qpsk.symbol_rate;
+       state->frequency = props->frequency;
+       state->srate = props->symbol_rate;
        state->search_mode = STV090x_SEARCH_AUTO;
        state->algo = STV090x_COLD_SEARCH;
        state->fec = STV090x_PRERR;
@@ -4712,10 +4710,9 @@ int stv090x_set_gpio(struct dvb_frontend *fe, u8 gpio, u8 dir, u8 value,
 EXPORT_SYMBOL(stv090x_set_gpio);
 
 static struct dvb_frontend_ops stv090x_ops = {
-
+       .delsys = { SYS_DVBS, SYS_DVBS2, SYS_DSS },
        .info = {
                .name                   = "STV090x Multistandard",
-               .type                   = FE_QPSK,
                .frequency_min          = 950000,
                .frequency_max          = 2150000,
                .frequency_stepsize     = 0,
@@ -4743,7 +4740,7 @@ static struct dvb_frontend_ops stv090x_ops = {
        .read_status                    = stv090x_read_status,
        .read_ber                       = stv090x_read_per,
        .read_signal_strength           = stv090x_read_signal_strength,
-       .read_snr                       = stv090x_read_cnr
+       .read_snr                       = stv090x_read_cnr,
 };