6 files changed, 175 insertions, 126 deletions

diff --git a/drivers/media/dvb/ttpci/av7110.c b/drivers/media/dvb/ttpci/av7110.c
index 3d20719fce1a..6ecbcf614878 100644
--- a/drivers/media/dvb/ttpci/av7110.c
+++ b/drivers/media/dvb/ttpci/av7110.c
@@ -991,7 +991,7 @@ static int av7110_start_feed(struct dvb_demux_feed *feed)
 
         if (feed->type == DMX_TYPE_TS) {
                 if ((feed->ts_type & TS_DECODER) &&
-                    (feed->pes_type < DMX_TS_PES_OTHER)) {
+                    (feed->pes_type <= DMX_TS_PES_PCR)) {
                         switch (demux->dmx.frontend->source) {
                         case DMX_MEMORY_FE:
                                 if (feed->ts_type & TS_DECODER)
@@ -1568,20 +1568,27 @@ static int get_firmware(struct av7110* av7110)
         return ret;
 }
 
-static int alps_bsrv2_tuner_set_params(struct dvb_frontend* fe, struct dvb_frontend_parameters *params)
+static int alps_bsrv2_tuner_set_params(struct dvb_frontend *fe)
 {
+        struct dtv_frontend_properties *p = &fe->dtv_property_cache;
         struct av7110* av7110 = fe->dvb->priv;
         u8 pwr = 0;
         u8 buf[4];
         struct i2c_msg msg = { .addr = 0x61, .flags = 0, .buf = buf, .len = sizeof(buf) };
-        u32 div = (params->frequency + 479500) / 125;
+        u32 div = (p->frequency + 479500) / 125;
 
-        if (params->frequency > 2000000) pwr = 3;
-        else if (params->frequency > 1800000) pwr = 2;
-        else if (params->frequency > 1600000) pwr = 1;
-        else if (params->frequency > 1200000) pwr = 0;
-        else if (params->frequency >= 1100000) pwr = 1;
-        else pwr = 2;
+        if (p->frequency > 2000000)
+                pwr = 3;
+        else if (p->frequency > 1800000)
+                pwr = 2;
+        else if (p->frequency > 1600000)
+                pwr = 1;
+        else if (p->frequency > 1200000)
+                pwr = 0;
+        else if (p->frequency >= 1100000)
+                pwr = 1;
+        else
+                pwr = 2;
 
         buf[0] = (div >> 8) & 0x7f;
         buf[1] = div & 0xff;
@@ -1604,19 +1611,20 @@ static struct ves1x93_config alps_bsrv2_config = {
         .invert_pwm = 0,
 };
 
-static int alps_tdbe2_tuner_set_params(struct dvb_frontend* fe, struct dvb_frontend_parameters *params)
+static int alps_tdbe2_tuner_set_params(struct dvb_frontend *fe)
 {
+        struct dtv_frontend_properties *p = &fe->dtv_property_cache;
         struct av7110* av7110 = fe->dvb->priv;
         u32 div;
         u8 data[4];
         struct i2c_msg msg = { .addr = 0x62, .flags = 0, .buf = data, .len = sizeof(data) };
 
-        div = (params->frequency + 35937500 + 31250) / 62500;
+        div = (p->frequency + 35937500 + 31250) / 62500;
 
         data[0] = (div >> 8) & 0x7f;
         data[1] = div & 0xff;
         data[2] = 0x85 | ((div >> 10) & 0x60);
-        data[3] = (params->frequency < 174000000 ? 0x88 : params->frequency < 470000000 ? 0x84 : 0x81);
+        data[3] = (p->frequency < 174000000 ? 0x88 : p->frequency < 470000000 ? 0x84 : 0x81);
 
         if (fe->ops.i2c_gate_ctrl)
                 fe->ops.i2c_gate_ctrl(fe, 1);
@@ -1635,14 +1643,15 @@ static struct ves1820_config alps_tdbe2_config = {
 
 
 
-static int grundig_29504_451_tuner_set_params(struct dvb_frontend* fe, struct dvb_frontend_parameters *params)
+static int grundig_29504_451_tuner_set_params(struct dvb_frontend *fe)
 {
+        struct dtv_frontend_properties *p = &fe->dtv_property_cache;
         struct av7110* av7110 = fe->dvb->priv;
         u32 div;
         u8 data[4];
         struct i2c_msg msg = { .addr = 0x61, .flags = 0, .buf = data, .len = sizeof(data) };
 
-        div = params->frequency / 125;
+        div = p->frequency / 125;
         data[0] = (div >> 8) & 0x7f;
         data[1] = div & 0xff;
         data[2] = 0x8e;
@@ -1661,11 +1670,12 @@ static struct tda8083_config grundig_29504_451_config = {
 
 
 
-static int philips_cd1516_tuner_set_params(struct dvb_frontend* fe, struct dvb_frontend_parameters *params)
+static int philips_cd1516_tuner_set_params(struct dvb_frontend *fe)
 {
+        struct dtv_frontend_properties *p = &fe->dtv_property_cache;
         struct av7110* av7110 = fe->dvb->priv;
         u32 div;
-        u32 f = params->frequency;
+        u32 f = p->frequency;
         u8 data[4];
         struct i2c_msg msg = { .addr = 0x61, .flags = 0, .buf = data, .len = sizeof(data) };
 
@@ -1692,16 +1702,17 @@ static struct ves1820_config philips_cd1516_config = {
 
 
 
-static int alps_tdlb7_tuner_set_params(struct dvb_frontend* fe, struct dvb_frontend_parameters *params)
+static int alps_tdlb7_tuner_set_params(struct dvb_frontend *fe)
 {
+        struct dtv_frontend_properties *p = &fe->dtv_property_cache;
         struct av7110* av7110 = fe->dvb->priv;
         u32 div, pwr;
         u8 data[4];
         struct i2c_msg msg = { .addr = 0x60, .flags = 0, .buf = data, .len = sizeof(data) };
 
-        div = (params->frequency + 36200000) / 166666;
+        div = (p->frequency + 36200000) / 166666;
 
-        if (params->frequency <= 782000000)
+        if (p->frequency <= 782000000)
                 pwr = 1;
         else
                 pwr = 2;
@@ -1829,8 +1840,9 @@ static u8 nexusca_stv0297_inittab[] = {
         0xff, 0xff,
 };
 
-static int nexusca_stv0297_tuner_set_params(struct dvb_frontend* fe, struct dvb_frontend_parameters *params)
+static int nexusca_stv0297_tuner_set_params(struct dvb_frontend *fe)
 {
+        struct dtv_frontend_properties *p = &fe->dtv_property_cache;
         struct av7110* av7110 = fe->dvb->priv;
         u32 div;
         u8 data[4];
@@ -1838,19 +1850,19 @@ static int nexusca_stv0297_tuner_set_params(struct dvb_frontend* fe, struct dvb_
         struct i2c_msg readmsg = { .addr = 0x63, .flags = I2C_M_RD, .buf = data, .len = 1 };
         int i;
 
-        div = (params->frequency + 36150000 + 31250) / 62500;
+        div = (p->frequency + 36150000 + 31250) / 62500;
 
         data[0] = (div >> 8) & 0x7f;
         data[1] = div & 0xff;
         data[2] = 0xce;
 
-        if (params->frequency < 45000000)
+        if (p->frequency < 45000000)
                 return -EINVAL;
-        else if (params->frequency < 137000000)
+        else if (p->frequency < 137000000)
                 data[3] = 0x01;
-        else if (params->frequency < 403000000)
+        else if (p->frequency < 403000000)
                 data[3] = 0x02;
-        else if (params->frequency < 860000000)
+        else if (p->frequency < 860000000)
                 data[3] = 0x04;
         else
                 return -EINVAL;
@@ -1884,27 +1896,36 @@ static struct stv0297_config nexusca_stv0297_config = {
 
 
 
-static int grundig_29504_401_tuner_set_params(struct dvb_frontend* fe, struct dvb_frontend_parameters *params)
+static int grundig_29504_401_tuner_set_params(struct dvb_frontend *fe)
 {
+        struct dtv_frontend_properties *p = &fe->dtv_property_cache;
         struct av7110* av7110 = fe->dvb->priv;
         u32 div;
         u8 cfg, cpump, band_select;
         u8 data[4];
         struct i2c_msg msg = { .addr = 0x61, .flags = 0, .buf = data, .len = sizeof(data) };
 
-        div = (36125000 + params->frequency) / 166666;
+        div = (36125000 + p->frequency) / 166666;
 
         cfg = 0x88;
 
-        if (params->frequency < 175000000) cpump = 2;
-        else if (params->frequency < 390000000) cpump = 1;
-        else if (params->frequency < 470000000) cpump = 2;
-        else if (params->frequency < 750000000) cpump = 1;
-        else cpump = 3;
+        if (p->frequency < 175000000)
+                cpump = 2;
+        else if (p->frequency < 390000000)
+                cpump = 1;
+        else if (p->frequency < 470000000)
+                cpump = 2;
+        else if (p->frequency < 750000000)
+                cpump = 1;
+        else
+                cpump = 3;
 
-        if (params->frequency < 175000000) band_select = 0x0e;
-        else if (params->frequency < 470000000) band_select = 0x05;
-        else band_select = 0x03;
+        if (p->frequency < 175000000)
+                band_select = 0x0e;
+        else if (p->frequency < 470000000)
+                band_select = 0x05;
+        else
+                band_select = 0x03;
 
         data[0] = (div >> 8) & 0x7f;
         data[1] = div & 0xff;
@@ -1964,15 +1985,14 @@ static int av7110_fe_lock_fix(struct av7110* av7110, fe_status_t status)
         return ret;
 }
 
-static int av7110_fe_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_parameters* params)
+static int av7110_fe_set_frontend(struct dvb_frontend *fe)
 {
         struct av7110* av7110 = fe->dvb->priv;
 
         int ret = av7110_fe_lock_fix(av7110, 0);
-        if (!ret) {
-                av7110->saved_fe_params = *params;
-                ret = av7110->fe_set_frontend(fe, params);
-        }
+        if (!ret)
+                ret = av7110->fe_set_frontend(fe);
+
         return ret;
 }
 
@@ -2081,7 +2101,7 @@ static void dvb_s_recover(struct av7110* av7110)
         msleep(20);
         av7110_fe_set_tone(av7110->fe, av7110->saved_tone);
 
-        av7110_fe_set_frontend(av7110->fe, &av7110->saved_fe_params);
+        av7110_fe_set_frontend(av7110->fe);
 }
 
 static u8 read_pwm(struct av7110* av7110)
diff --git a/drivers/media/dvb/ttpci/av7110.h b/drivers/media/dvb/ttpci/av7110.h
index d85b8512ac30..88b3b2d6cc0e 100644
--- a/drivers/media/dvb/ttpci/av7110.h
+++ b/drivers/media/dvb/ttpci/av7110.h
@@ -272,7 +272,6 @@ struct av7110 {
 
         /* crash recovery */
         void                            (*recover)(struct av7110* av7110);
-        struct dvb_frontend_parameters  saved_fe_params;
         fe_sec_voltage_t                saved_voltage;
         fe_sec_tone_mode_t              saved_tone;
         struct dvb_diseqc_master_cmd    saved_master_cmd;
@@ -286,7 +285,7 @@ struct av7110 {
         int (*fe_set_tone)(struct dvb_frontend* fe, fe_sec_tone_mode_t tone);
         int (*fe_set_voltage)(struct dvb_frontend* fe, fe_sec_voltage_t voltage);
         int (*fe_dishnetwork_send_legacy_command)(struct dvb_frontend* fe, unsigned long cmd);
-        int (*fe_set_frontend)(struct dvb_frontend* fe, struct dvb_frontend_parameters* params);
+        int (*fe_set_frontend)(struct dvb_frontend *fe);
 };
 
 
diff --git a/drivers/media/dvb/ttpci/budget-av.c b/drivers/media/dvb/ttpci/budget-av.c
index 78d32f7e49fc..8b32e282bf5d 100644
--- a/drivers/media/dvb/ttpci/budget-av.c
+++ b/drivers/media/dvb/ttpci/budget-av.c
@@ -502,33 +502,33 @@ static int philips_su1278_ty_ci_set_symbol_rate(struct dvb_frontend *fe, u32 sra
         return 0;
 }
 
-static int philips_su1278_ty_ci_tuner_set_params(struct dvb_frontend *fe,
-                                                 struct dvb_frontend_parameters *params)
+static int philips_su1278_ty_ci_tuner_set_params(struct dvb_frontend *fe)
 {
+        struct dtv_frontend_properties *c = &fe->dtv_property_cache;
         u32 div;
         u8 buf[4];
         struct budget *budget = (struct budget *) fe->dvb->priv;
         struct i2c_msg msg = {.addr = 0x61,.flags = 0,.buf = buf,.len = sizeof(buf) };
 
-        if ((params->frequency < 950000) || (params->frequency > 2150000))
+        if ((c->frequency < 950000) || (c->frequency > 2150000))
                 return -EINVAL;
 
-        div = (params->frequency + (125 - 1)) / 125;    // round correctly
+        div = (c->frequency + (125 - 1)) / 125; /* round correctly */
         buf[0] = (div >> 8) & 0x7f;
         buf[1] = div & 0xff;
         buf[2] = 0x80 | ((div & 0x18000) >> 10) | 4;
         buf[3] = 0x20;
 
-        if (params->u.qpsk.symbol_rate < 4000000)
+        if (c->symbol_rate < 4000000)
                 buf[3] |= 1;
 
-        if (params->frequency < 1250000)
+        if (c->frequency < 1250000)
                 buf[3] |= 0;
-        else if (params->frequency < 1550000)
+        else if (c->frequency < 1550000)
                 buf[3] |= 0x40;
-        else if (params->frequency < 2050000)
+        else if (c->frequency < 2050000)
                 buf[3] |= 0x80;
-        else if (params->frequency < 2150000)
+        else if (c->frequency < 2150000)
                 buf[3] |= 0xC0;
 
         if (fe->ops.i2c_gate_ctrl)
@@ -617,8 +617,9 @@ static struct stv0299_config cinergy_1200s_1894_0010_config = {
         .set_symbol_rate = philips_su1278_ty_ci_set_symbol_rate,
 };
 
-static int philips_cu1216_tuner_set_params(struct dvb_frontend *fe, struct dvb_frontend_parameters *params)
+static int philips_cu1216_tuner_set_params(struct dvb_frontend *fe)
 {
+        struct dtv_frontend_properties *c = &fe->dtv_property_cache;
         struct budget *budget = (struct budget *) fe->dvb->priv;
         u8 buf[6];
         struct i2c_msg msg = {.addr = 0x60,.flags = 0,.buf = buf,.len = sizeof(buf) };
@@ -627,13 +628,13 @@ static int philips_cu1216_tuner_set_params(struct dvb_frontend *fe, struct dvb_f
 #define CU1216_IF 36125000
 #define TUNER_MUL 62500
 
-        u32 div = (params->frequency + CU1216_IF + TUNER_MUL / 2) / TUNER_MUL;
+        u32 div = (c->frequency + CU1216_IF + TUNER_MUL / 2) / TUNER_MUL;
 
         buf[0] = (div >> 8) & 0x7f;
         buf[1] = div & 0xff;
         buf[2] = 0xce;
-        buf[3] = (params->frequency < 150000000 ? 0x01 :
-                  params->frequency < 445000000 ? 0x02 : 0x04);
+        buf[3] = (c->frequency < 150000000 ? 0x01 :
+                  c->frequency < 445000000 ? 0x02 : 0x04);
         buf[4] = 0xde;
         buf[5] = 0x20;
 
@@ -697,8 +698,9 @@ static int philips_tu1216_tuner_init(struct dvb_frontend *fe)
         return 0;
 }
 
-static int philips_tu1216_tuner_set_params(struct dvb_frontend *fe, struct dvb_frontend_parameters *params)
+static int philips_tu1216_tuner_set_params(struct dvb_frontend *fe)
 {
+        struct dtv_frontend_properties *c = &fe->dtv_property_cache;
         struct budget *budget = (struct budget *) fe->dvb->priv;
         u8 tuner_buf[4];
         struct i2c_msg tuner_msg = {.addr = 0x60,.flags = 0,.buf = tuner_buf,.len =
@@ -707,7 +709,7 @@ static int philips_tu1216_tuner_set_params(struct dvb_frontend *fe, struct dvb_f
         u8 band, cp, filter;
 
         // determine charge pump
-        tuner_frequency = params->frequency + 36166000;
+        tuner_frequency = c->frequency + 36166000;
         if (tuner_frequency < 87000000)
                 return -EINVAL;
         else if (tuner_frequency < 130000000)
@@ -732,28 +734,28 @@ static int philips_tu1216_tuner_set_params(struct dvb_frontend *fe, struct dvb_f
                 return -EINVAL;
 
         // determine band
-        if (params->frequency < 49000000)
+        if (c->frequency < 49000000)
                 return -EINVAL;
-        else if (params->frequency < 161000000)
+        else if (c->frequency < 161000000)
                 band = 1;
-        else if (params->frequency < 444000000)
+        else if (c->frequency < 444000000)
                 band = 2;
-        else if (params->frequency < 861000000)
+        else if (c->frequency < 861000000)
                 band = 4;
         else
                 return -EINVAL;
 
         // setup PLL filter
-        switch (params->u.ofdm.bandwidth) {
-        case BANDWIDTH_6_MHZ:
+        switch (c->bandwidth_hz) {
+        case 6000000:
                 filter = 0;
                 break;
 
-        case BANDWIDTH_7_MHZ:
+        case 7000000:
                 filter = 0;
                 break;
 
-        case BANDWIDTH_8_MHZ:
+        case 8000000:
                 filter = 1;
                 break;
 
@@ -763,7 +765,7 @@ static int philips_tu1216_tuner_set_params(struct dvb_frontend *fe, struct dvb_f
 
         // calculate divisor
         // ((36166000+((1000000/6)/2)) + Finput)/(1000000/6)
-        tuner_frequency = (((params->frequency / 1000) * 6) + 217496) / 1000;
+        tuner_frequency = (((c->frequency / 1000) * 6) + 217496) / 1000;
 
         // setup tuner buffer
         tuner_buf[0] = (tuner_frequency >> 8) & 0x7f;
diff --git a/drivers/media/dvb/ttpci/budget-ci.c b/drivers/media/dvb/ttpci/budget-ci.c
index ca02e9722172..98e524178765 100644
--- a/drivers/media/dvb/ttpci/budget-ci.c
+++ b/drivers/media/dvb/ttpci/budget-ci.c
@@ -193,7 +193,6 @@ static int msp430_ir_init(struct budget_ci *budget_ci)
         dev->input_phys = budget_ci->ir.phys;
         dev->input_id.bustype = BUS_PCI;
         dev->input_id.version = 1;
-        dev->scanmask = 0xff;
         if (saa->pci->subsystem_vendor) {
                 dev->input_id.vendor = saa->pci->subsystem_vendor;
                 dev->input_id.product = saa->pci->subsystem_device;
@@ -234,6 +233,8 @@ static int msp430_ir_init(struct budget_ci *budget_ci)
                 dev->map_name = RC_MAP_BUDGET_CI_OLD;
                 break;
         }
+        if (!budget_ci->ir.full_rc5)
+                dev->scanmask = 0xff;
 
         error = rc_register_device(dev);
         if (error) {
@@ -659,33 +660,33 @@ static int philips_su1278_tt_set_symbol_rate(struct dvb_frontend *fe, u32 srate,
         return 0;
 }
 
-static int philips_su1278_tt_tuner_set_params(struct dvb_frontend *fe,
-                                           struct dvb_frontend_parameters *params)
+static int philips_su1278_tt_tuner_set_params(struct dvb_frontend *fe)
 {
+        struct dtv_frontend_properties *p = &fe->dtv_property_cache;
         struct budget_ci *budget_ci = (struct budget_ci *) fe->dvb->priv;
         u32 div;
         u8 buf[4];
         struct i2c_msg msg = {.addr = 0x60,.flags = 0,.buf = buf,.len = sizeof(buf) };
 
-        if ((params->frequency < 950000) || (params->frequency > 2150000))
+        if ((p->frequency < 950000) || (p->frequency > 2150000))
                 return -EINVAL;
 
-        div = (params->frequency + (500 - 1)) / 500;    // round correctly
+        div = (p->frequency + (500 - 1)) / 500; /* round correctly */
         buf[0] = (div >> 8) & 0x7f;
         buf[1] = div & 0xff;
         buf[2] = 0x80 | ((div & 0x18000) >> 10) | 2;
         buf[3] = 0x20;
 
-        if (params->u.qpsk.symbol_rate < 4000000)
+        if (p->symbol_rate < 4000000)
                 buf[3] |= 1;
 
-        if (params->frequency < 1250000)
+        if (p->frequency < 1250000)
                 buf[3] |= 0;
-        else if (params->frequency < 1550000)
+        else if (p->frequency < 1550000)
                 buf[3] |= 0x40;
-        else if (params->frequency < 2050000)
+        else if (p->frequency < 2050000)
                 buf[3] |= 0x80;
-        else if (params->frequency < 2150000)
+        else if (p->frequency < 2150000)
                 buf[3] |= 0xC0;
 
         if (fe->ops.i2c_gate_ctrl)
@@ -740,8 +741,9 @@ static int philips_tdm1316l_tuner_init(struct dvb_frontend *fe)
         return 0;
 }
 
-static int philips_tdm1316l_tuner_set_params(struct dvb_frontend *fe, struct dvb_frontend_parameters *params)
+static int philips_tdm1316l_tuner_set_params(struct dvb_frontend *fe)
 {
+        struct dtv_frontend_properties *p = &fe->dtv_property_cache;
         struct budget_ci *budget_ci = (struct budget_ci *) fe->dvb->priv;
         u8 tuner_buf[4];
         struct i2c_msg tuner_msg = {.addr = budget_ci->tuner_pll_address,.flags = 0,.buf = tuner_buf,.len = sizeof(tuner_buf) };
@@ -749,7 +751,7 @@ static int philips_tdm1316l_tuner_set_params(struct dvb_frontend *fe, struct dvb
         u8 band, cp, filter;
 
         // determine charge pump
-        tuner_frequency = params->frequency + 36130000;
+        tuner_frequency = p->frequency + 36130000;
         if (tuner_frequency < 87000000)
                 return -EINVAL;
         else if (tuner_frequency < 130000000)
@@ -774,30 +776,30 @@ static int philips_tdm1316l_tuner_set_params(struct dvb_frontend *fe, struct dvb
                 return -EINVAL;
 
         // determine band
-        if (params->frequency < 49000000)
+        if (p->frequency < 49000000)
                 return -EINVAL;
-        else if (params->frequency < 159000000)
+        else if (p->frequency < 159000000)
                 band = 1;
-        else if (params->frequency < 444000000)
+        else if (p->frequency < 444000000)
                 band = 2;
-        else if (params->frequency < 861000000)
+        else if (p->frequency < 861000000)
                 band = 4;
         else
                 return -EINVAL;
 
         // setup PLL filter and TDA9889
-        switch (params->u.ofdm.bandwidth) {
-        case BANDWIDTH_6_MHZ:
+        switch (p->bandwidth_hz) {
+        case 6000000:
                 tda1004x_writereg(fe, 0x0C, 0x14);
                 filter = 0;
                 break;
 
-        case BANDWIDTH_7_MHZ:
+        case 7000000:
                 tda1004x_writereg(fe, 0x0C, 0x80);
                 filter = 0;
                 break;
 
-        case BANDWIDTH_8_MHZ:
+        case 8000000:
                 tda1004x_writereg(fe, 0x0C, 0x14);
                 filter = 1;
                 break;
@@ -808,7 +810,7 @@ static int philips_tdm1316l_tuner_set_params(struct dvb_frontend *fe, struct dvb
 
         // calculate divisor
         // ((36130000+((1000000/6)/2)) + Finput)/(1000000/6)
-        tuner_frequency = (((params->frequency / 1000) * 6) + 217280) / 1000;
+        tuner_frequency = (((p->frequency / 1000) * 6) + 217280) / 1000;
 
         // setup tuner buffer
         tuner_buf[0] = tuner_frequency >> 8;
@@ -855,8 +857,9 @@ static struct tda1004x_config philips_tdm1316l_config_invert = {
         .request_firmware = philips_tdm1316l_request_firmware,
 };
 
-static int dvbc_philips_tdm1316l_tuner_set_params(struct dvb_frontend *fe, struct dvb_frontend_parameters *params)
+static int dvbc_philips_tdm1316l_tuner_set_params(struct dvb_frontend *fe)
 {
+        struct dtv_frontend_properties *p = &fe->dtv_property_cache;
         struct budget_ci *budget_ci = (struct budget_ci *) fe->dvb->priv;
         u8 tuner_buf[5];
         struct i2c_msg tuner_msg = {.addr = budget_ci->tuner_pll_address,
@@ -867,7 +870,7 @@ static int dvbc_philips_tdm1316l_tuner_set_params(struct dvb_frontend *fe, struc
         u8 band, cp, filter;
 
         // determine charge pump
-        tuner_frequency = params->frequency + 36125000;
+        tuner_frequency = p->frequency + 36125000;
         if (tuner_frequency < 87000000)
                 return -EINVAL;
         else if (tuner_frequency < 130000000) {
@@ -904,7 +907,7 @@ static int dvbc_philips_tdm1316l_tuner_set_params(struct dvb_frontend *fe, struc
         filter = 1;
 
         // calculate divisor
-        tuner_frequency = (params->frequency + 36125000 + (62500/2)) / 62500;
+        tuner_frequency = (p->frequency + 36125000 + (62500/2)) / 62500;
 
         // setup tuner buffer
         tuner_buf[0] = tuner_frequency >> 8;
diff --git a/drivers/media/dvb/ttpci/budget-patch.c b/drivers/media/dvb/ttpci/budget-patch.c
index 3395d1a90516..2cb35c23d2ac 100644
--- a/drivers/media/dvb/ttpci/budget-patch.c
+++ b/drivers/media/dvb/ttpci/budget-patch.c
@@ -261,19 +261,25 @@ static int budget_patch_diseqc_send_burst(struct dvb_frontend* fe, fe_sec_mini_c
         return 0;
 }
 
-static int alps_bsrv2_tuner_set_params(struct dvb_frontend* fe, struct dvb_frontend_parameters* params)
+static int alps_bsrv2_tuner_set_params(struct dvb_frontend *fe)
 {
+        struct dtv_frontend_properties *p = &fe->dtv_property_cache;
         struct budget_patch* budget = (struct budget_patch*) fe->dvb->priv;
         u8 pwr = 0;
         u8 buf[4];
         struct i2c_msg msg = { .addr = 0x61, .flags = 0, .buf = buf, .len = sizeof(buf) };
-        u32 div = (params->frequency + 479500) / 125;
-
-        if (params->frequency > 2000000) pwr = 3;
-        else if (params->frequency > 1800000) pwr = 2;
-        else if (params->frequency > 1600000) pwr = 1;
-        else if (params->frequency > 1200000) pwr = 0;
-        else if (params->frequency >= 1100000) pwr = 1;
+        u32 div = (p->frequency + 479500) / 125;
+
+        if (p->frequency > 2000000)
+                pwr = 3;
+        else if (p->frequency > 1800000)
+                pwr = 2;
+        else if (p->frequency > 1600000)
+                pwr = 1;
+        else if (p->frequency > 1200000)
+                pwr = 0;
+        else if (p->frequency >= 1100000)
+                pwr = 1;
         else pwr = 2;
 
         buf[0] = (div >> 8) & 0x7f;
@@ -297,14 +303,15 @@ static struct ves1x93_config alps_bsrv2_config = {
         .invert_pwm = 0,
 };
 
-static int grundig_29504_451_tuner_set_params(struct dvb_frontend* fe, struct dvb_frontend_parameters* params)
+static int grundig_29504_451_tuner_set_params(struct dvb_frontend *fe)
 {
+        struct dtv_frontend_properties *p = &fe->dtv_property_cache;
         struct budget_patch* budget = (struct budget_patch*) fe->dvb->priv;
         u32 div;
         u8 data[4];
         struct i2c_msg msg = { .addr = 0x61, .flags = 0, .buf = data, .len = sizeof(data) };
 
-        div = params->frequency / 125;
+        div = p->frequency / 125;
         data[0] = (div >> 8) & 0x7f;
         data[1] = div & 0xff;
         data[2] = 0x8e;
diff --git a/drivers/media/dvb/ttpci/budget.c b/drivers/media/dvb/ttpci/budget.c
index d238fb9371a7..b21bcce66708 100644
--- a/drivers/media/dvb/ttpci/budget.c
+++ b/drivers/media/dvb/ttpci/budget.c
@@ -200,19 +200,25 @@ static int budget_diseqc_send_burst(struct dvb_frontend* fe, fe_sec_mini_cmd_t m
         return 0;
 }
 
-static int alps_bsrv2_tuner_set_params(struct dvb_frontend* fe, struct dvb_frontend_parameters* params)
+static int alps_bsrv2_tuner_set_params(struct dvb_frontend *fe)
 {
+        struct dtv_frontend_properties *c = &fe->dtv_property_cache;
         struct budget* budget = (struct budget*) fe->dvb->priv;
         u8 pwr = 0;
         u8 buf[4];
         struct i2c_msg msg = { .addr = 0x61, .flags = 0, .buf = buf, .len = sizeof(buf) };
-        u32 div = (params->frequency + 479500) / 125;
-
-        if (params->frequency > 2000000) pwr = 3;
-        else if (params->frequency > 1800000) pwr = 2;
-        else if (params->frequency > 1600000) pwr = 1;
-        else if (params->frequency > 1200000) pwr = 0;
-        else if (params->frequency >= 1100000) pwr = 1;
+        u32 div = (c->frequency + 479500) / 125;
+
+        if (c->frequency > 2000000)
+                pwr = 3;
+        else if (c->frequency > 1800000)
+                pwr = 2;
+        else if (c->frequency > 1600000)
+                pwr = 1;
+        else if (c->frequency > 1200000)
+                pwr = 0;
+        else if (c->frequency >= 1100000)
+                pwr = 1;
         else pwr = 2;
 
         buf[0] = (div >> 8) & 0x7f;
@@ -236,19 +242,20 @@ static struct ves1x93_config alps_bsrv2_config =
         .invert_pwm = 0,
 };
 
-static int alps_tdbe2_tuner_set_params(struct dvb_frontend* fe, struct dvb_frontend_parameters* params)
+static int alps_tdbe2_tuner_set_params(struct dvb_frontend *fe)
 {
+        struct dtv_frontend_properties *c = &fe->dtv_property_cache;
         struct budget* budget = (struct budget*) fe->dvb->priv;
         u32 div;
         u8 data[4];
         struct i2c_msg msg = { .addr = 0x62, .flags = 0, .buf = data, .len = sizeof(data) };
 
-        div = (params->frequency + 35937500 + 31250) / 62500;
+        div = (c->frequency + 35937500 + 31250) / 62500;
 
         data[0] = (div >> 8) & 0x7f;
         data[1] = div & 0xff;
         data[2] = 0x85 | ((div >> 10) & 0x60);
-        data[3] = (params->frequency < 174000000 ? 0x88 : params->frequency < 470000000 ? 0x84 : 0x81);
+        data[3] = (c->frequency < 174000000 ? 0x88 : c->frequency < 470000000 ? 0x84 : 0x81);
 
         if (fe->ops.i2c_gate_ctrl)
                 fe->ops.i2c_gate_ctrl(fe, 1);
@@ -263,8 +270,9 @@ static struct ves1820_config alps_tdbe2_config = {
         .selagc = VES1820_SELAGC_SIGNAMPERR,
 };
 
-static int grundig_29504_401_tuner_set_params(struct dvb_frontend* fe, struct dvb_frontend_parameters* params)
+static int grundig_29504_401_tuner_set_params(struct dvb_frontend *fe)
 {
+        struct dtv_frontend_properties *c = &fe->dtv_property_cache;
         struct budget *budget = fe->dvb->priv;
         u8 *tuner_addr = fe->tuner_priv;
         u32 div;
@@ -277,19 +285,27 @@ static int grundig_29504_401_tuner_set_params(struct dvb_frontend* fe, struct dv
         else
                 msg.addr = 0x61;
 
-        div = (36125000 + params->frequency) / 166666;
+        div = (36125000 + c->frequency) / 166666;
 
         cfg = 0x88;
 
-        if (params->frequency < 175000000) cpump = 2;
-        else if (params->frequency < 390000000) cpump = 1;
-        else if (params->frequency < 470000000) cpump = 2;
-        else if (params->frequency < 750000000) cpump = 1;
-        else cpump = 3;
+        if (c->frequency < 175000000)
+                cpump = 2;
+        else if (c->frequency < 390000000)
+                cpump = 1;
+        else if (c->frequency < 470000000)
+                cpump = 2;
+        else if (c->frequency < 750000000)
+                cpump = 1;
+        else
+                cpump = 3;
 
-        if (params->frequency < 175000000) band_select = 0x0e;
-        else if (params->frequency < 470000000) band_select = 0x05;
-        else band_select = 0x03;
+        if (c->frequency < 175000000)
+                band_select = 0x0e;
+        else if (c->frequency < 470000000)
+                band_select = 0x05;
+        else
+                band_select = 0x03;
 
         data[0] = (div >> 8) & 0x7f;
         data[1] = div & 0xff;
@@ -312,14 +328,15 @@ static struct l64781_config grundig_29504_401_config_activy = {
 
 static u8 tuner_address_grundig_29504_401_activy = 0x60;
 
-static int grundig_29504_451_tuner_set_params(struct dvb_frontend* fe, struct dvb_frontend_parameters* params)
+static int grundig_29504_451_tuner_set_params(struct dvb_frontend *fe)
 {
+        struct dtv_frontend_properties *c = &fe->dtv_property_cache;
         struct budget* budget = (struct budget*) fe->dvb->priv;
         u32 div;
         u8 data[4];
         struct i2c_msg msg = { .addr = 0x61, .flags = 0, .buf = data, .len = sizeof(data) };
 
-        div = params->frequency / 125;
+        div = c->frequency / 125;
         data[0] = (div >> 8) & 0x7f;
         data[1] = div & 0xff;
         data[2] = 0x8e;
@@ -335,14 +352,15 @@ static struct tda8083_config grundig_29504_451_config = {
         .demod_address = 0x68,
 };
 
-static int s5h1420_tuner_set_params(struct dvb_frontend* fe, struct dvb_frontend_parameters* params)
+static int s5h1420_tuner_set_params(struct dvb_frontend *fe)
 {
+        struct dtv_frontend_properties *c = &fe->dtv_property_cache;
         struct budget* budget = (struct budget*) fe->dvb->priv;
         u32 div;
         u8 data[4];
         struct i2c_msg msg = { .addr = 0x61, .flags = 0, .buf = data, .len = sizeof(data) };
 
-        div = params->frequency / 1000;
+        div = c->frequency / 1000;
         data[0] = (div >> 8) & 0x7f;
         data[1] = div & 0xff;
         data[2] = 0xc2;