1 files changed, 19 insertions, 17 deletions

diff --git a/drivers/media/dvb/frontends/dib9000.c b/drivers/media/dvb/frontends/dib9000.c
index 660f80661ed..863ef3cfab9 100644
--- a/drivers/media/dvb/frontends/dib9000.c
+++ b/drivers/media/dvb/frontends/dib9000.c
@@ -1136,7 +1136,7 @@ static int dib9000_fw_init(struct dib9000_state *state)
         return 0;
 }
 
-static void dib9000_fw_set_channel_head(struct dib9000_state *state, struct dvb_frontend_parameters *ch)
+static void dib9000_fw_set_channel_head(struct dib9000_state *state)
 {
         u8 b[9];
         u32 freq = state->fe[0]->dtv_property_cache.frequency / 1000;
@@ -1157,7 +1157,7 @@ static void dib9000_fw_set_channel_head(struct dib9000_state *state, struct dvb_
         dib9000_risc_mem_write(state, FE_MM_W_CHANNEL_HEAD, b);
 }
 
-static int dib9000_fw_get_channel(struct dvb_frontend *fe, struct dvb_frontend_parameters *channel)
+static int dib9000_fw_get_channel(struct dvb_frontend *fe)
 {
         struct dib9000_state *state = fe->demodulator_priv;
         struct dibDVBTChannel {
@@ -1309,7 +1309,7 @@ error:
         return ret;
 }
 
-static int dib9000_fw_set_channel_union(struct dvb_frontend *fe, struct dvb_frontend_parameters *channel)
+static int dib9000_fw_set_channel_union(struct dvb_frontend *fe)
 {
         struct dib9000_state *state = fe->demodulator_priv;
         struct dibDVBTChannel {
@@ -1454,7 +1454,7 @@ static int dib9000_fw_set_channel_union(struct dvb_frontend *fe, struct dvb_fron
         return 0;
 }
 
-static int dib9000_fw_tune(struct dvb_frontend *fe, struct dvb_frontend_parameters *ch)
+static int dib9000_fw_tune(struct dvb_frontend *fe)
 {
         struct dib9000_state *state = fe->demodulator_priv;
         int ret = 10, search = state->channel_status.status == CHANNEL_STATUS_PARAMETERS_UNKNOWN;
@@ -1462,7 +1462,7 @@ static int dib9000_fw_tune(struct dvb_frontend *fe, struct dvb_frontend_paramete
 
         switch (state->tune_state) {
         case CT_DEMOD_START:
-                dib9000_fw_set_channel_head(state, ch);
+                dib9000_fw_set_channel_head(state);
 
                 /* write the channel context - a channel is initialized to 0, so it is OK */
                 dib9000_risc_mem_write(state, FE_MM_W_CHANNEL_CONTEXT, (u8 *) fe_info);
@@ -1471,7 +1471,7 @@ static int dib9000_fw_tune(struct dvb_frontend *fe, struct dvb_frontend_paramete
                 if (search)
                         dib9000_mbx_send(state, OUT_MSG_FE_CHANNEL_SEARCH, NULL, 0);
                 else {
-                        dib9000_fw_set_channel_union(fe, ch);
+                        dib9000_fw_set_channel_union(fe);
                         dib9000_mbx_send(state, OUT_MSG_FE_CHANNEL_TUNE, NULL, 0);
                 }
                 state->tune_state = CT_DEMOD_STEP_1;
@@ -1867,7 +1867,7 @@ static int dib9000_fe_get_tune_settings(struct dvb_frontend *fe, struct dvb_fron
         return 0;
 }
 
-static int dib9000_get_frontend(struct dvb_frontend *fe, struct dvb_frontend_parameters *fep)
+static int dib9000_get_frontend(struct dvb_frontend *fe)
 {
         struct dib9000_state *state = fe->demodulator_priv;
         u8 index_frontend, sub_index_frontend;
@@ -1883,7 +1883,7 @@ static int dib9000_get_frontend(struct dvb_frontend *fe, struct dvb_frontend_par
                         dprintk("TPS lock on the slave%i", index_frontend);
 
                         /* synchronize the cache with the other frontends */
-                        state->fe[index_frontend]->ops.get_frontend(state->fe[index_frontend], fep);
+                        state->fe[index_frontend]->ops.get_frontend(state->fe[index_frontend]);
                         for (sub_index_frontend = 0; (sub_index_frontend < MAX_NUMBER_OF_FRONTENDS) && (state->fe[sub_index_frontend] != NULL);
                              sub_index_frontend++) {
                                 if (sub_index_frontend != index_frontend) {
@@ -1911,7 +1911,7 @@ static int dib9000_get_frontend(struct dvb_frontend *fe, struct dvb_frontend_par
         }
 
         /* get the channel from master chip */
-        ret = dib9000_fw_get_channel(fe, fep);
+        ret = dib9000_fw_get_channel(fe);
         if (ret != 0)
                 goto return_value;
 
@@ -1958,7 +1958,7 @@ static int dib9000_set_channel_status(struct dvb_frontend *fe, struct dvb_fronte
         return 0;
 }
 
-static int dib9000_set_frontend(struct dvb_frontend *fe, struct dvb_frontend_parameters *fep)
+static int dib9000_set_frontend(struct dvb_frontend *fe)
 {
         struct dib9000_state *state = fe->demodulator_priv;
         int sleep_time, sleep_time_slave;
@@ -1983,8 +1983,10 @@ static int dib9000_set_frontend(struct dvb_frontend *fe, struct dvb_frontend_par
         fe->dtv_property_cache.delivery_system = SYS_DVBT;
 
         /* set the master status */
-        if (fep->u.ofdm.transmission_mode == TRANSMISSION_MODE_AUTO ||
-            fep->u.ofdm.guard_interval == GUARD_INTERVAL_AUTO || fep->u.ofdm.constellation == QAM_AUTO || fep->u.ofdm.code_rate_HP == FEC_AUTO) {
+        if (state->fe[0]->dtv_property_cache.transmission_mode == TRANSMISSION_MODE_AUTO ||
+            state->fe[0]->dtv_property_cache.guard_interval == GUARD_INTERVAL_AUTO ||
+            state->fe[0]->dtv_property_cache.modulation == QAM_AUTO ||
+            state->fe[0]->dtv_property_cache.code_rate_HP == FEC_AUTO) {
                 /* no channel specified, autosearch the channel */
                 state->channel_status.status = CHANNEL_STATUS_PARAMETERS_UNKNOWN;
         } else
@@ -2008,9 +2010,9 @@ static int dib9000_set_frontend(struct dvb_frontend *fe, struct dvb_frontend_par
         exit_condition = 0;     /* 0: tune pending; 1: tune failed; 2:tune success */
         index_frontend_success = 0;
         do {
-                sleep_time = dib9000_fw_tune(state->fe[0], NULL);
+                sleep_time = dib9000_fw_tune(state->fe[0]);
                 for (index_frontend = 1; (index_frontend < MAX_NUMBER_OF_FRONTENDS) && (state->fe[index_frontend] != NULL); index_frontend++) {
-                        sleep_time_slave = dib9000_fw_tune(state->fe[index_frontend], NULL);
+                        sleep_time_slave = dib9000_fw_tune(state->fe[index_frontend]);
                         if (sleep_time == FE_CALLBACK_TIME_NEVER)
                                 sleep_time = sleep_time_slave;
                         else if ((sleep_time_slave != FE_CALLBACK_TIME_NEVER) && (sleep_time_slave > sleep_time))
@@ -2052,7 +2054,7 @@ static int dib9000_set_frontend(struct dvb_frontend *fe, struct dvb_frontend_par
 
         /* synchronize all the channel cache */
         state->get_frontend_internal = 1;
-        dib9000_get_frontend(state->fe[0], fep);
+        dib9000_get_frontend(state->fe[0]);
         state->get_frontend_internal = 0;
 
         /* retune the other frontends with the found channel */
@@ -2068,7 +2070,7 @@ static int dib9000_set_frontend(struct dvb_frontend *fe, struct dvb_frontend_par
                 sleep_time = FE_CALLBACK_TIME_NEVER;
                 for (index_frontend = 0; (index_frontend < MAX_NUMBER_OF_FRONTENDS) && (state->fe[index_frontend] != NULL); index_frontend++) {
                         if (index_frontend != index_frontend_success) {
-                                sleep_time_slave = dib9000_fw_tune(state->fe[index_frontend], NULL);
+                                sleep_time_slave = dib9000_fw_tune(state->fe[index_frontend]);
                                 if (sleep_time == FE_CALLBACK_TIME_NEVER)
                                         sleep_time = sleep_time_slave;
                                 else if ((sleep_time_slave != FE_CALLBACK_TIME_NEVER) && (sleep_time_slave > sleep_time))
@@ -2495,9 +2497,9 @@ error:
 EXPORT_SYMBOL(dib9000_attach);
 
 static struct dvb_frontend_ops dib9000_ops = {
+        .delsys = { SYS_DVBT },
         .info = {
                  .name = "DiBcom 9000",
-                 .type = FE_OFDM,
                  .frequency_min = 44250000,
                  .frequency_max = 867250000,
                  .frequency_stepsize = 62500,