diff options
Diffstat (limited to 'drivers/media')
102 files changed, 148 insertions, 186 deletions
diff --git a/drivers/media/common/tuners/max2165.c b/drivers/media/common/tuners/max2165.c index 03434491e333..cb2c98fbad1b 100644 --- a/drivers/media/common/tuners/max2165.c +++ b/drivers/media/common/tuners/max2165.c | |||
@@ -257,8 +257,7 @@ static void max2165_debug_status(struct max2165_priv *priv) | |||
257 | dprintk("VCO: %d, VCO Sub-band: %d, ADC: %d\n", vco, vco_sub_band, adc); | 257 | dprintk("VCO: %d, VCO Sub-band: %d, ADC: %d\n", vco, vco_sub_band, adc); |
258 | } | 258 | } |
259 | 259 | ||
260 | static int max2165_set_params(struct dvb_frontend *fe, | 260 | static int max2165_set_params(struct dvb_frontend *fe) |
261 | struct dvb_frontend_parameters *params) | ||
262 | { | 261 | { |
263 | struct max2165_priv *priv = fe->tuner_priv; | 262 | struct max2165_priv *priv = fe->tuner_priv; |
264 | struct dtv_frontend_properties *c = &fe->dtv_property_cache; | 263 | struct dtv_frontend_properties *c = &fe->dtv_property_cache; |
diff --git a/drivers/media/common/tuners/mc44s803.c b/drivers/media/common/tuners/mc44s803.c index 5a8758cad5e9..5ddce7e326f7 100644 --- a/drivers/media/common/tuners/mc44s803.c +++ b/drivers/media/common/tuners/mc44s803.c | |||
@@ -214,8 +214,7 @@ exit: | |||
214 | return err; | 214 | return err; |
215 | } | 215 | } |
216 | 216 | ||
217 | static int mc44s803_set_params(struct dvb_frontend *fe, | 217 | static int mc44s803_set_params(struct dvb_frontend *fe) |
218 | struct dvb_frontend_parameters *params) | ||
219 | { | 218 | { |
220 | struct mc44s803_priv *priv = fe->tuner_priv; | 219 | struct mc44s803_priv *priv = fe->tuner_priv; |
221 | struct dtv_frontend_properties *c = &fe->dtv_property_cache; | 220 | struct dtv_frontend_properties *c = &fe->dtv_property_cache; |
diff --git a/drivers/media/common/tuners/mt2060.c b/drivers/media/common/tuners/mt2060.c index 6fe2ef9f6259..13381de58a84 100644 --- a/drivers/media/common/tuners/mt2060.c +++ b/drivers/media/common/tuners/mt2060.c | |||
@@ -153,7 +153,7 @@ static int mt2060_spurcheck(u32 lo1,u32 lo2,u32 if2) | |||
153 | #define IF2 36150 // IF2 frequency = 36.150 MHz | 153 | #define IF2 36150 // IF2 frequency = 36.150 MHz |
154 | #define FREF 16000 // Quartz oscillator 16 MHz | 154 | #define FREF 16000 // Quartz oscillator 16 MHz |
155 | 155 | ||
156 | static int mt2060_set_params(struct dvb_frontend *fe, struct dvb_frontend_parameters *params) | 156 | static int mt2060_set_params(struct dvb_frontend *fe) |
157 | { | 157 | { |
158 | struct dtv_frontend_properties *c = &fe->dtv_property_cache; | 158 | struct dtv_frontend_properties *c = &fe->dtv_property_cache; |
159 | struct mt2060_priv *priv; | 159 | struct mt2060_priv *priv; |
diff --git a/drivers/media/common/tuners/mt2131.c b/drivers/media/common/tuners/mt2131.c index d9cab1ff6dff..f83b0c1ea6c8 100644 --- a/drivers/media/common/tuners/mt2131.c +++ b/drivers/media/common/tuners/mt2131.c | |||
@@ -92,8 +92,7 @@ static int mt2131_writeregs(struct mt2131_priv *priv,u8 *buf, u8 len) | |||
92 | return 0; | 92 | return 0; |
93 | } | 93 | } |
94 | 94 | ||
95 | static int mt2131_set_params(struct dvb_frontend *fe, | 95 | static int mt2131_set_params(struct dvb_frontend *fe) |
96 | struct dvb_frontend_parameters *params) | ||
97 | { | 96 | { |
98 | struct dtv_frontend_properties *c = &fe->dtv_property_cache; | 97 | struct dtv_frontend_properties *c = &fe->dtv_property_cache; |
99 | struct mt2131_priv *priv; | 98 | struct mt2131_priv *priv; |
diff --git a/drivers/media/common/tuners/mt2266.c b/drivers/media/common/tuners/mt2266.c index dd883d781968..2fb5a60a621c 100644 --- a/drivers/media/common/tuners/mt2266.c +++ b/drivers/media/common/tuners/mt2266.c | |||
@@ -122,7 +122,7 @@ static u8 mt2266_vhf[] = { 0x1d, 0xfe, 0x00, 0x00, 0xb4, 0x03, 0xa5, 0xa5, | |||
122 | 122 | ||
123 | #define FREF 30000 // Quartz oscillator 30 MHz | 123 | #define FREF 30000 // Quartz oscillator 30 MHz |
124 | 124 | ||
125 | static int mt2266_set_params(struct dvb_frontend *fe, struct dvb_frontend_parameters *params) | 125 | static int mt2266_set_params(struct dvb_frontend *fe) |
126 | { | 126 | { |
127 | struct dtv_frontend_properties *c = &fe->dtv_property_cache; | 127 | struct dtv_frontend_properties *c = &fe->dtv_property_cache; |
128 | struct mt2266_priv *priv; | 128 | struct mt2266_priv *priv; |
diff --git a/drivers/media/common/tuners/mxl5005s.c b/drivers/media/common/tuners/mxl5005s.c index c35d3551410e..6133315fb0e3 100644 --- a/drivers/media/common/tuners/mxl5005s.c +++ b/drivers/media/common/tuners/mxl5005s.c | |||
@@ -3979,8 +3979,7 @@ static int mxl5005s_AssignTunerMode(struct dvb_frontend *fe, u32 mod_type, | |||
3979 | return 0; | 3979 | return 0; |
3980 | } | 3980 | } |
3981 | 3981 | ||
3982 | static int mxl5005s_set_params(struct dvb_frontend *fe, | 3982 | static int mxl5005s_set_params(struct dvb_frontend *fe) |
3983 | struct dvb_frontend_parameters *params) | ||
3984 | { | 3983 | { |
3985 | struct mxl5005s_state *state = fe->tuner_priv; | 3984 | struct mxl5005s_state *state = fe->tuner_priv; |
3986 | struct dtv_frontend_properties *c = &fe->dtv_property_cache; | 3985 | struct dtv_frontend_properties *c = &fe->dtv_property_cache; |
diff --git a/drivers/media/common/tuners/mxl5007t.c b/drivers/media/common/tuners/mxl5007t.c index e22fcb12bcf3..844cfac79f6f 100644 --- a/drivers/media/common/tuners/mxl5007t.c +++ b/drivers/media/common/tuners/mxl5007t.c | |||
@@ -616,8 +616,7 @@ fail: | |||
616 | 616 | ||
617 | /* ------------------------------------------------------------------------- */ | 617 | /* ------------------------------------------------------------------------- */ |
618 | 618 | ||
619 | static int mxl5007t_set_params(struct dvb_frontend *fe, | 619 | static int mxl5007t_set_params(struct dvb_frontend *fe) |
620 | struct dvb_frontend_parameters *params) | ||
621 | { | 620 | { |
622 | struct dtv_frontend_properties *c = &fe->dtv_property_cache; | 621 | struct dtv_frontend_properties *c = &fe->dtv_property_cache; |
623 | u32 delsys = c->delivery_system; | 622 | u32 delsys = c->delivery_system; |
diff --git a/drivers/media/common/tuners/qt1010.c b/drivers/media/common/tuners/qt1010.c index bd433adc492e..2d79b1f5d5eb 100644 --- a/drivers/media/common/tuners/qt1010.c +++ b/drivers/media/common/tuners/qt1010.c | |||
@@ -82,8 +82,7 @@ static void qt1010_dump_regs(struct qt1010_priv *priv) | |||
82 | printk(KERN_CONT "\n"); | 82 | printk(KERN_CONT "\n"); |
83 | } | 83 | } |
84 | 84 | ||
85 | static int qt1010_set_params(struct dvb_frontend *fe, | 85 | static int qt1010_set_params(struct dvb_frontend *fe) |
86 | struct dvb_frontend_parameters *params) | ||
87 | { | 86 | { |
88 | struct dtv_frontend_properties *c = &fe->dtv_property_cache; | 87 | struct dtv_frontend_properties *c = &fe->dtv_property_cache; |
89 | struct qt1010_priv *priv; | 88 | struct qt1010_priv *priv; |
@@ -319,7 +318,6 @@ static u8 qt1010_init_meas2(struct qt1010_priv *priv, | |||
319 | static int qt1010_init(struct dvb_frontend *fe) | 318 | static int qt1010_init(struct dvb_frontend *fe) |
320 | { | 319 | { |
321 | struct qt1010_priv *priv = fe->tuner_priv; | 320 | struct qt1010_priv *priv = fe->tuner_priv; |
322 | struct dvb_frontend_parameters params; | ||
323 | struct dtv_frontend_properties *c = &fe->dtv_property_cache; | 321 | struct dtv_frontend_properties *c = &fe->dtv_property_cache; |
324 | int err = 0; | 322 | int err = 0; |
325 | u8 i, tmpval, *valptr = NULL; | 323 | u8 i, tmpval, *valptr = NULL; |
@@ -399,7 +397,7 @@ static int qt1010_init(struct dvb_frontend *fe) | |||
399 | 397 | ||
400 | c->frequency = 545000000; /* Sigmatek DVB-110 545000000 */ | 398 | c->frequency = 545000000; /* Sigmatek DVB-110 545000000 */ |
401 | /* MSI Megasky 580 GL861 533000000 */ | 399 | /* MSI Megasky 580 GL861 533000000 */ |
402 | return qt1010_set_params(fe, ¶ms); | 400 | return qt1010_set_params(fe); |
403 | } | 401 | } |
404 | 402 | ||
405 | static int qt1010_release(struct dvb_frontend *fe) | 403 | static int qt1010_release(struct dvb_frontend *fe) |
diff --git a/drivers/media/common/tuners/tda18212.c b/drivers/media/common/tuners/tda18212.c index a58c74f107a4..602c2e392b17 100644 --- a/drivers/media/common/tuners/tda18212.c +++ b/drivers/media/common/tuners/tda18212.c | |||
@@ -130,8 +130,7 @@ static void tda18212_dump_regs(struct tda18212_priv *priv) | |||
130 | } | 130 | } |
131 | #endif | 131 | #endif |
132 | 132 | ||
133 | static int tda18212_set_params(struct dvb_frontend *fe, | 133 | static int tda18212_set_params(struct dvb_frontend *fe) |
134 | struct dvb_frontend_parameters *p) | ||
135 | { | 134 | { |
136 | struct tda18212_priv *priv = fe->tuner_priv; | 135 | struct tda18212_priv *priv = fe->tuner_priv; |
137 | struct dtv_frontend_properties *c = &fe->dtv_property_cache; | 136 | struct dtv_frontend_properties *c = &fe->dtv_property_cache; |
diff --git a/drivers/media/common/tuners/tda18218.c b/drivers/media/common/tuners/tda18218.c index bcdd826dac38..dfb3a831df45 100644 --- a/drivers/media/common/tuners/tda18218.c +++ b/drivers/media/common/tuners/tda18218.c | |||
@@ -109,8 +109,7 @@ static int tda18218_rd_reg(struct tda18218_priv *priv, u8 reg, u8 *val) | |||
109 | return tda18218_rd_regs(priv, reg, val, 1); | 109 | return tda18218_rd_regs(priv, reg, val, 1); |
110 | } | 110 | } |
111 | 111 | ||
112 | static int tda18218_set_params(struct dvb_frontend *fe, | 112 | static int tda18218_set_params(struct dvb_frontend *fe) |
113 | struct dvb_frontend_parameters *params) | ||
114 | { | 113 | { |
115 | struct tda18218_priv *priv = fe->tuner_priv; | 114 | struct tda18218_priv *priv = fe->tuner_priv; |
116 | struct dtv_frontend_properties *c = &fe->dtv_property_cache; | 115 | struct dtv_frontend_properties *c = &fe->dtv_property_cache; |
diff --git a/drivers/media/common/tuners/tda18271-fe.c b/drivers/media/common/tuners/tda18271-fe.c index 6348bb302139..53299b0a857c 100644 --- a/drivers/media/common/tuners/tda18271-fe.c +++ b/drivers/media/common/tuners/tda18271-fe.c | |||
@@ -928,8 +928,7 @@ fail: | |||
928 | 928 | ||
929 | /* ------------------------------------------------------------------ */ | 929 | /* ------------------------------------------------------------------ */ |
930 | 930 | ||
931 | static int tda18271_set_params(struct dvb_frontend *fe, | 931 | static int tda18271_set_params(struct dvb_frontend *fe) |
932 | struct dvb_frontend_parameters *params) | ||
933 | { | 932 | { |
934 | struct dtv_frontend_properties *c = &fe->dtv_property_cache; | 933 | struct dtv_frontend_properties *c = &fe->dtv_property_cache; |
935 | u32 delsys = c->delivery_system; | 934 | u32 delsys = c->delivery_system; |
diff --git a/drivers/media/common/tuners/tda827x.c b/drivers/media/common/tuners/tda827x.c index 7316308d9388..d96d0b9e1899 100644 --- a/drivers/media/common/tuners/tda827x.c +++ b/drivers/media/common/tuners/tda827x.c | |||
@@ -152,8 +152,7 @@ static int tuner_transfer(struct dvb_frontend *fe, | |||
152 | return rc; | 152 | return rc; |
153 | } | 153 | } |
154 | 154 | ||
155 | static int tda827xo_set_params(struct dvb_frontend *fe, | 155 | static int tda827xo_set_params(struct dvb_frontend *fe) |
156 | struct dvb_frontend_parameters *params) | ||
157 | { | 156 | { |
158 | struct dtv_frontend_properties *c = &fe->dtv_property_cache; | 157 | struct dtv_frontend_properties *c = &fe->dtv_property_cache; |
159 | struct tda827x_priv *priv = fe->tuner_priv; | 158 | struct tda827x_priv *priv = fe->tuner_priv; |
@@ -517,8 +516,7 @@ static void tda827xa_lna_gain(struct dvb_frontend *fe, int high, | |||
517 | } | 516 | } |
518 | } | 517 | } |
519 | 518 | ||
520 | static int tda827xa_set_params(struct dvb_frontend *fe, | 519 | static int tda827xa_set_params(struct dvb_frontend *fe) |
521 | struct dvb_frontend_parameters *params) | ||
522 | { | 520 | { |
523 | struct dtv_frontend_properties *c = &fe->dtv_property_cache; | 521 | struct dtv_frontend_properties *c = &fe->dtv_property_cache; |
524 | struct tda827x_priv *priv = fe->tuner_priv; | 522 | struct tda827x_priv *priv = fe->tuner_priv; |
diff --git a/drivers/media/common/tuners/tuner-simple.c b/drivers/media/common/tuners/tuner-simple.c index 1dad5fbb4de0..ce91c43c53e8 100644 --- a/drivers/media/common/tuners/tuner-simple.c +++ b/drivers/media/common/tuners/tuner-simple.c | |||
@@ -907,8 +907,7 @@ static int simple_dvb_calc_regs(struct dvb_frontend *fe, | |||
907 | return 5; | 907 | return 5; |
908 | } | 908 | } |
909 | 909 | ||
910 | static int simple_dvb_set_params(struct dvb_frontend *fe, | 910 | static int simple_dvb_set_params(struct dvb_frontend *fe) |
911 | struct dvb_frontend_parameters *params) | ||
912 | { | 911 | { |
913 | struct dtv_frontend_properties *c = &fe->dtv_property_cache; | 912 | struct dtv_frontend_properties *c = &fe->dtv_property_cache; |
914 | u32 delsys = c->delivery_system; | 913 | u32 delsys = c->delivery_system; |
diff --git a/drivers/media/common/tuners/tuner-xc2028.c b/drivers/media/common/tuners/tuner-xc2028.c index d052c264a457..bdcbfd740f02 100644 --- a/drivers/media/common/tuners/tuner-xc2028.c +++ b/drivers/media/common/tuners/tuner-xc2028.c | |||
@@ -1084,8 +1084,7 @@ static int xc2028_set_analog_freq(struct dvb_frontend *fe, | |||
1084 | V4L2_TUNER_ANALOG_TV, type, p->std, 0); | 1084 | V4L2_TUNER_ANALOG_TV, type, p->std, 0); |
1085 | } | 1085 | } |
1086 | 1086 | ||
1087 | static int xc2028_set_params(struct dvb_frontend *fe, | 1087 | static int xc2028_set_params(struct dvb_frontend *fe) |
1088 | struct dvb_frontend_parameters *p) | ||
1089 | { | 1088 | { |
1090 | struct dtv_frontend_properties *c = &fe->dtv_property_cache; | 1089 | struct dtv_frontend_properties *c = &fe->dtv_property_cache; |
1091 | u32 delsys = c->delivery_system; | 1090 | u32 delsys = c->delivery_system; |
diff --git a/drivers/media/common/tuners/xc4000.c b/drivers/media/common/tuners/xc4000.c index ee6db66143f1..793c5c69c2f2 100644 --- a/drivers/media/common/tuners/xc4000.c +++ b/drivers/media/common/tuners/xc4000.c | |||
@@ -1121,8 +1121,7 @@ static void xc_debug_dump(struct xc4000_priv *priv) | |||
1121 | dprintk(1, "*** Quality (0:<8dB, 7:>56dB) = %d\n", quality); | 1121 | dprintk(1, "*** Quality (0:<8dB, 7:>56dB) = %d\n", quality); |
1122 | } | 1122 | } |
1123 | 1123 | ||
1124 | static int xc4000_set_params(struct dvb_frontend *fe, | 1124 | static int xc4000_set_params(struct dvb_frontend *fe) |
1125 | struct dvb_frontend_parameters *params) | ||
1126 | { | 1125 | { |
1127 | struct dtv_frontend_properties *c = &fe->dtv_property_cache; | 1126 | struct dtv_frontend_properties *c = &fe->dtv_property_cache; |
1128 | u32 delsys = c->delivery_system; | 1127 | u32 delsys = c->delivery_system; |
diff --git a/drivers/media/common/tuners/xc5000.c b/drivers/media/common/tuners/xc5000.c index 5c56d3cc030b..7796339bcc7a 100644 --- a/drivers/media/common/tuners/xc5000.c +++ b/drivers/media/common/tuners/xc5000.c | |||
@@ -628,8 +628,7 @@ static void xc_debug_dump(struct xc5000_priv *priv) | |||
628 | dprintk(1, "*** Quality (0:<8dB, 7:>56dB) = %d\n", quality); | 628 | dprintk(1, "*** Quality (0:<8dB, 7:>56dB) = %d\n", quality); |
629 | } | 629 | } |
630 | 630 | ||
631 | static int xc5000_set_params(struct dvb_frontend *fe, | 631 | static int xc5000_set_params(struct dvb_frontend *fe) |
632 | struct dvb_frontend_parameters *params) | ||
633 | { | 632 | { |
634 | int ret, b; | 633 | int ret, b; |
635 | struct xc5000_priv *priv = fe->tuner_priv; | 634 | struct xc5000_priv *priv = fe->tuner_priv; |
diff --git a/drivers/media/dvb/bt8xx/dvb-bt8xx.c b/drivers/media/dvb/bt8xx/dvb-bt8xx.c index 87e4c72989d1..b79629f1e520 100644 --- a/drivers/media/dvb/bt8xx/dvb-bt8xx.c +++ b/drivers/media/dvb/bt8xx/dvb-bt8xx.c | |||
@@ -192,7 +192,7 @@ static struct zl10353_config thomson_dtt7579_zl10353_config = { | |||
192 | .demod_address = 0x0f, | 192 | .demod_address = 0x0f, |
193 | }; | 193 | }; |
194 | 194 | ||
195 | static int cx24108_tuner_set_params(struct dvb_frontend* fe, struct dvb_frontend_parameters* params) | 195 | static int cx24108_tuner_set_params(struct dvb_frontend *fe) |
196 | { | 196 | { |
197 | struct dtv_frontend_properties *c = &fe->dtv_property_cache; | 197 | struct dtv_frontend_properties *c = &fe->dtv_property_cache; |
198 | u32 freq = c->frequency; | 198 | u32 freq = c->frequency; |
@@ -267,7 +267,7 @@ static struct cx24110_config pctvsat_config = { | |||
267 | .demod_address = 0x55, | 267 | .demod_address = 0x55, |
268 | }; | 268 | }; |
269 | 269 | ||
270 | static int microtune_mt7202dtf_tuner_set_params(struct dvb_frontend* fe, struct dvb_frontend_parameters* params) | 270 | static int microtune_mt7202dtf_tuner_set_params(struct dvb_frontend *fe) |
271 | { | 271 | { |
272 | struct dtv_frontend_properties *c = &fe->dtv_property_cache; | 272 | struct dtv_frontend_properties *c = &fe->dtv_property_cache; |
273 | struct dvb_bt8xx_card *card = (struct dvb_bt8xx_card *) fe->dvb->priv; | 273 | struct dvb_bt8xx_card *card = (struct dvb_bt8xx_card *) fe->dvb->priv; |
@@ -463,7 +463,7 @@ static struct or51211_config or51211_config = { | |||
463 | .sleep = or51211_sleep, | 463 | .sleep = or51211_sleep, |
464 | }; | 464 | }; |
465 | 465 | ||
466 | static int vp3021_alps_tded4_tuner_set_params(struct dvb_frontend* fe, struct dvb_frontend_parameters* params) | 466 | static int vp3021_alps_tded4_tuner_set_params(struct dvb_frontend *fe) |
467 | { | 467 | { |
468 | struct dtv_frontend_properties *c = &fe->dtv_property_cache; | 468 | struct dtv_frontend_properties *c = &fe->dtv_property_cache; |
469 | struct dvb_bt8xx_card *card = (struct dvb_bt8xx_card *) fe->dvb->priv; | 469 | struct dvb_bt8xx_card *card = (struct dvb_bt8xx_card *) fe->dvb->priv; |
diff --git a/drivers/media/dvb/dvb-core/dvb_frontend.h b/drivers/media/dvb/dvb-core/dvb_frontend.h index 99ae7828f893..895f88f06f5b 100644 --- a/drivers/media/dvb/dvb-core/dvb_frontend.h +++ b/drivers/media/dvb/dvb-core/dvb_frontend.h | |||
@@ -198,7 +198,7 @@ struct dvb_tuner_ops { | |||
198 | int (*sleep)(struct dvb_frontend *fe); | 198 | int (*sleep)(struct dvb_frontend *fe); |
199 | 199 | ||
200 | /** This is for simple PLLs - set all parameters in one go. */ | 200 | /** This is for simple PLLs - set all parameters in one go. */ |
201 | int (*set_params)(struct dvb_frontend *fe, struct dvb_frontend_parameters *p); | 201 | int (*set_params)(struct dvb_frontend *fe); |
202 | int (*set_analog_params)(struct dvb_frontend *fe, struct analog_parameters *p); | 202 | int (*set_analog_params)(struct dvb_frontend *fe, struct analog_parameters *p); |
203 | 203 | ||
204 | /** This is support for demods like the mt352 - fills out the supplied buffer with what to write. */ | 204 | /** This is support for demods like the mt352 - fills out the supplied buffer with what to write. */ |
diff --git a/drivers/media/dvb/dvb-usb/af9005-fe.c b/drivers/media/dvb/dvb-usb/af9005-fe.c index 3263e9749d09..aa44f6592a32 100644 --- a/drivers/media/dvb/dvb-usb/af9005-fe.c +++ b/drivers/media/dvb/dvb-usb/af9005-fe.c | |||
@@ -1189,7 +1189,7 @@ static int af9005_fe_set_frontend(struct dvb_frontend *fe, | |||
1189 | return ret; | 1189 | return ret; |
1190 | /* set tuner */ | 1190 | /* set tuner */ |
1191 | deb_info("set tuner\n"); | 1191 | deb_info("set tuner\n"); |
1192 | ret = fe->ops.tuner_ops.set_params(fe, fep); | 1192 | ret = fe->ops.tuner_ops.set_params(fe); |
1193 | if (ret) | 1193 | if (ret) |
1194 | return ret; | 1194 | return ret; |
1195 | 1195 | ||
diff --git a/drivers/media/dvb/dvb-usb/cxusb.c b/drivers/media/dvb/dvb-usb/cxusb.c index 4f9bfc543807..e8e5a74fa5c7 100644 --- a/drivers/media/dvb/dvb-usb/cxusb.c +++ b/drivers/media/dvb/dvb-usb/cxusb.c | |||
@@ -1067,12 +1067,10 @@ static struct dib0070_config dib7070p_dib0070_config = { | |||
1067 | }; | 1067 | }; |
1068 | 1068 | ||
1069 | struct dib0700_adapter_state { | 1069 | struct dib0700_adapter_state { |
1070 | int (*set_param_save) (struct dvb_frontend *, | 1070 | int (*set_param_save) (struct dvb_frontend *); |
1071 | struct dvb_frontend_parameters *); | ||
1072 | }; | 1071 | }; |
1073 | 1072 | ||
1074 | static int dib7070_set_param_override(struct dvb_frontend *fe, | 1073 | static int dib7070_set_param_override(struct dvb_frontend *fe) |
1075 | struct dvb_frontend_parameters *fep) | ||
1076 | { | 1074 | { |
1077 | struct dtv_frontend_properties *p = &fe->dtv_property_cache; | 1075 | struct dtv_frontend_properties *p = &fe->dtv_property_cache; |
1078 | struct dvb_usb_adapter *adap = fe->dvb->priv; | 1076 | struct dvb_usb_adapter *adap = fe->dvb->priv; |
@@ -1088,7 +1086,7 @@ static int dib7070_set_param_override(struct dvb_frontend *fe, | |||
1088 | 1086 | ||
1089 | dib7000p_set_wbd_ref(fe, offset + dib0070_wbd_offset(fe)); | 1087 | dib7000p_set_wbd_ref(fe, offset + dib0070_wbd_offset(fe)); |
1090 | 1088 | ||
1091 | return state->set_param_save(fe, fep); | 1089 | return state->set_param_save(fe); |
1092 | } | 1090 | } |
1093 | 1091 | ||
1094 | static int cxusb_dualdig4_rev2_tuner_attach(struct dvb_usb_adapter *adap) | 1092 | static int cxusb_dualdig4_rev2_tuner_attach(struct dvb_usb_adapter *adap) |
diff --git a/drivers/media/dvb/dvb-usb/dib0700_devices.c b/drivers/media/dvb/dvb-usb/dib0700_devices.c index 70c3be6a1ec2..81ef4b46f790 100644 --- a/drivers/media/dvb/dvb-usb/dib0700_devices.c +++ b/drivers/media/dvb/dvb-usb/dib0700_devices.c | |||
@@ -30,7 +30,7 @@ MODULE_PARM_DESC(force_lna_activation, "force the activation of Low-Noise-Amplif | |||
30 | "if applicable for the device (default: 0=automatic/off)."); | 30 | "if applicable for the device (default: 0=automatic/off)."); |
31 | 31 | ||
32 | struct dib0700_adapter_state { | 32 | struct dib0700_adapter_state { |
33 | int (*set_param_save) (struct dvb_frontend *, struct dvb_frontend_parameters *); | 33 | int (*set_param_save) (struct dvb_frontend *); |
34 | const struct firmware *frontend_firmware; | 34 | const struct firmware *frontend_firmware; |
35 | }; | 35 | }; |
36 | 36 | ||
@@ -804,7 +804,7 @@ static struct dib0070_config dib7770p_dib0070_config = { | |||
804 | .charge_pump = 2, | 804 | .charge_pump = 2, |
805 | }; | 805 | }; |
806 | 806 | ||
807 | static int dib7070_set_param_override(struct dvb_frontend *fe, struct dvb_frontend_parameters *fep) | 807 | static int dib7070_set_param_override(struct dvb_frontend *fe) |
808 | { | 808 | { |
809 | struct dtv_frontend_properties *p = &fe->dtv_property_cache; | 809 | struct dtv_frontend_properties *p = &fe->dtv_property_cache; |
810 | struct dvb_usb_adapter *adap = fe->dvb->priv; | 810 | struct dvb_usb_adapter *adap = fe->dvb->priv; |
@@ -819,11 +819,10 @@ static int dib7070_set_param_override(struct dvb_frontend *fe, struct dvb_fronte | |||
819 | } | 819 | } |
820 | deb_info("WBD for DiB7000P: %d\n", offset + dib0070_wbd_offset(fe)); | 820 | deb_info("WBD for DiB7000P: %d\n", offset + dib0070_wbd_offset(fe)); |
821 | dib7000p_set_wbd_ref(fe, offset + dib0070_wbd_offset(fe)); | 821 | dib7000p_set_wbd_ref(fe, offset + dib0070_wbd_offset(fe)); |
822 | return state->set_param_save(fe, fep); | 822 | return state->set_param_save(fe); |
823 | } | 823 | } |
824 | 824 | ||
825 | static int dib7770_set_param_override(struct dvb_frontend *fe, | 825 | static int dib7770_set_param_override(struct dvb_frontend *fe) |
826 | struct dvb_frontend_parameters *fep) | ||
827 | { | 826 | { |
828 | struct dtv_frontend_properties *p = &fe->dtv_property_cache; | 827 | struct dtv_frontend_properties *p = &fe->dtv_property_cache; |
829 | struct dvb_usb_adapter *adap = fe->dvb->priv; | 828 | struct dvb_usb_adapter *adap = fe->dvb->priv; |
@@ -844,7 +843,7 @@ static int dib7770_set_param_override(struct dvb_frontend *fe, | |||
844 | } | 843 | } |
845 | deb_info("WBD for DiB7000P: %d\n", offset + dib0070_wbd_offset(fe)); | 844 | deb_info("WBD for DiB7000P: %d\n", offset + dib0070_wbd_offset(fe)); |
846 | dib7000p_set_wbd_ref(fe, offset + dib0070_wbd_offset(fe)); | 845 | dib7000p_set_wbd_ref(fe, offset + dib0070_wbd_offset(fe)); |
847 | return state->set_param_save(fe, fep); | 846 | return state->set_param_save(fe); |
848 | } | 847 | } |
849 | 848 | ||
850 | static int dib7770p_tuner_attach(struct dvb_usb_adapter *adap) | 849 | static int dib7770p_tuner_attach(struct dvb_usb_adapter *adap) |
@@ -1207,8 +1206,7 @@ static struct dib0070_config dib807x_dib0070_config[2] = { | |||
1207 | } | 1206 | } |
1208 | }; | 1207 | }; |
1209 | 1208 | ||
1210 | static int dib807x_set_param_override(struct dvb_frontend *fe, | 1209 | static int dib807x_set_param_override(struct dvb_frontend *fe) |
1211 | struct dvb_frontend_parameters *fep) | ||
1212 | { | 1210 | { |
1213 | struct dtv_frontend_properties *p = &fe->dtv_property_cache; | 1211 | struct dtv_frontend_properties *p = &fe->dtv_property_cache; |
1214 | struct dvb_usb_adapter *adap = fe->dvb->priv; | 1212 | struct dvb_usb_adapter *adap = fe->dvb->priv; |
@@ -1227,7 +1225,7 @@ static int dib807x_set_param_override(struct dvb_frontend *fe, | |||
1227 | deb_info("WBD for DiB8000: %d\n", offset); | 1225 | deb_info("WBD for DiB8000: %d\n", offset); |
1228 | dib8000_set_wbd_ref(fe, offset); | 1226 | dib8000_set_wbd_ref(fe, offset); |
1229 | 1227 | ||
1230 | return state->set_param_save(fe, fep); | 1228 | return state->set_param_save(fe); |
1231 | } | 1229 | } |
1232 | 1230 | ||
1233 | static int dib807x_tuner_attach(struct dvb_usb_adapter *adap) | 1231 | static int dib807x_tuner_attach(struct dvb_usb_adapter *adap) |
@@ -1506,8 +1504,7 @@ static struct dib0090_config dib809x_dib0090_config = { | |||
1506 | .fref_clock_ratio = 6, | 1504 | .fref_clock_ratio = 6, |
1507 | }; | 1505 | }; |
1508 | 1506 | ||
1509 | static int dib8096_set_param_override(struct dvb_frontend *fe, | 1507 | static int dib8096_set_param_override(struct dvb_frontend *fe) |
1510 | struct dvb_frontend_parameters *fep) | ||
1511 | { | 1508 | { |
1512 | struct dtv_frontend_properties *p = &fe->dtv_property_cache; | 1509 | struct dtv_frontend_properties *p = &fe->dtv_property_cache; |
1513 | struct dvb_usb_adapter *adap = fe->dvb->priv; | 1510 | struct dvb_usb_adapter *adap = fe->dvb->priv; |
@@ -1518,7 +1515,7 @@ static int dib8096_set_param_override(struct dvb_frontend *fe, | |||
1518 | enum frontend_tune_state tune_state = CT_SHUTDOWN; | 1515 | enum frontend_tune_state tune_state = CT_SHUTDOWN; |
1519 | u16 ltgain, rf_gain_limit; | 1516 | u16 ltgain, rf_gain_limit; |
1520 | 1517 | ||
1521 | ret = state->set_param_save(fe, fep); | 1518 | ret = state->set_param_save(fe); |
1522 | if (ret < 0) | 1519 | if (ret < 0) |
1523 | return ret; | 1520 | return ret; |
1524 | 1521 | ||
@@ -1823,8 +1820,7 @@ struct dibx090p_adc dib8090p_adc_tab[] = { | |||
1823 | {0xffffffff, 0, 0, 0}, /* 60 MHz */ | 1820 | {0xffffffff, 0, 0, 0}, /* 60 MHz */ |
1824 | }; | 1821 | }; |
1825 | 1822 | ||
1826 | static int dib8096p_agc_startup(struct dvb_frontend *fe, | 1823 | static int dib8096p_agc_startup(struct dvb_frontend *fe) |
1827 | struct dvb_frontend_parameters *fep) | ||
1828 | { | 1824 | { |
1829 | struct dtv_frontend_properties *p = &fe->dtv_property_cache; | 1825 | struct dtv_frontend_properties *p = &fe->dtv_property_cache; |
1830 | struct dvb_usb_adapter *adap = fe->dvb->priv; | 1826 | struct dvb_usb_adapter *adap = fe->dvb->priv; |
@@ -1834,7 +1830,7 @@ static int dib8096p_agc_startup(struct dvb_frontend *fe, | |||
1834 | int better_sampling_freq = 0, ret; | 1830 | int better_sampling_freq = 0, ret; |
1835 | struct dibx090p_adc *adc_table = &dib8090p_adc_tab[0]; | 1831 | struct dibx090p_adc *adc_table = &dib8090p_adc_tab[0]; |
1836 | 1832 | ||
1837 | ret = state->set_param_save(fe, fep); | 1833 | ret = state->set_param_save(fe); |
1838 | if (ret < 0) | 1834 | if (ret < 0) |
1839 | return ret; | 1835 | return ret; |
1840 | memset(&pll, 0, sizeof(struct dibx000_bandwidth_config)); | 1836 | memset(&pll, 0, sizeof(struct dibx000_bandwidth_config)); |
@@ -2325,7 +2321,7 @@ static int dib7090p_get_best_sampling(struct dvb_frontend *fe , struct dib7090p_ | |||
2325 | return 0; | 2321 | return 0; |
2326 | } | 2322 | } |
2327 | 2323 | ||
2328 | static int dib7090_agc_startup(struct dvb_frontend *fe, struct dvb_frontend_parameters *fep) | 2324 | static int dib7090_agc_startup(struct dvb_frontend *fe) |
2329 | { | 2325 | { |
2330 | struct dvb_usb_adapter *adap = fe->dvb->priv; | 2326 | struct dvb_usb_adapter *adap = fe->dvb->priv; |
2331 | struct dib0700_adapter_state *state = adap->priv; | 2327 | struct dib0700_adapter_state *state = adap->priv; |
@@ -2334,7 +2330,7 @@ static int dib7090_agc_startup(struct dvb_frontend *fe, struct dvb_frontend_para | |||
2334 | struct dib7090p_best_adc adc; | 2330 | struct dib7090p_best_adc adc; |
2335 | int ret; | 2331 | int ret; |
2336 | 2332 | ||
2337 | ret = state->set_param_save(fe, fep); | 2333 | ret = state->set_param_save(fe); |
2338 | if (ret < 0) | 2334 | if (ret < 0) |
2339 | return ret; | 2335 | return ret; |
2340 | 2336 | ||
diff --git a/drivers/media/dvb/dvb-usb/digitv.c b/drivers/media/dvb/dvb-usb/digitv.c index 2856ab74e964..00a446deaa76 100644 --- a/drivers/media/dvb/dvb-usb/digitv.c +++ b/drivers/media/dvb/dvb-usb/digitv.c | |||
@@ -118,7 +118,7 @@ static struct mt352_config digitv_mt352_config = { | |||
118 | .demod_init = digitv_mt352_demod_init, | 118 | .demod_init = digitv_mt352_demod_init, |
119 | }; | 119 | }; |
120 | 120 | ||
121 | static int digitv_nxt6000_tuner_set_params(struct dvb_frontend *fe, struct dvb_frontend_parameters *fep) | 121 | static int digitv_nxt6000_tuner_set_params(struct dvb_frontend *fe) |
122 | { | 122 | { |
123 | struct dvb_usb_adapter *adap = fe->dvb->priv; | 123 | struct dvb_usb_adapter *adap = fe->dvb->priv; |
124 | u8 b[5]; | 124 | u8 b[5]; |
diff --git a/drivers/media/dvb/dvb-usb/mxl111sf-demod.c b/drivers/media/dvb/dvb-usb/mxl111sf-demod.c index d1f58371c711..3ae772910a08 100644 --- a/drivers/media/dvb/dvb-usb/mxl111sf-demod.c +++ b/drivers/media/dvb/dvb-usb/mxl111sf-demod.c | |||
@@ -303,7 +303,7 @@ static int mxl111sf_demod_set_frontend(struct dvb_frontend *fe, | |||
303 | mxl_dbg("()"); | 303 | mxl_dbg("()"); |
304 | 304 | ||
305 | if (fe->ops.tuner_ops.set_params) { | 305 | if (fe->ops.tuner_ops.set_params) { |
306 | ret = fe->ops.tuner_ops.set_params(fe, param); | 306 | ret = fe->ops.tuner_ops.set_params(fe); |
307 | if (mxl_fail(ret)) | 307 | if (mxl_fail(ret)) |
308 | goto fail; | 308 | goto fail; |
309 | msleep(50); | 309 | msleep(50); |
diff --git a/drivers/media/dvb/dvb-usb/mxl111sf-tuner.c b/drivers/media/dvb/dvb-usb/mxl111sf-tuner.c index aeac7a9a80d6..3a533df2d8d3 100644 --- a/drivers/media/dvb/dvb-usb/mxl111sf-tuner.c +++ b/drivers/media/dvb/dvb-usb/mxl111sf-tuner.c | |||
@@ -272,8 +272,7 @@ static int mxl1x1sf_tuner_loop_thru_ctrl(struct mxl111sf_tuner_state *state, | |||
272 | 272 | ||
273 | /* ------------------------------------------------------------------------ */ | 273 | /* ------------------------------------------------------------------------ */ |
274 | 274 | ||
275 | static int mxl111sf_tuner_set_params(struct dvb_frontend *fe, | 275 | static int mxl111sf_tuner_set_params(struct dvb_frontend *fe) |
276 | struct dvb_frontend_parameters *params) | ||
277 | { | 276 | { |
278 | struct dtv_frontend_properties *c = &fe->dtv_property_cache; | 277 | struct dtv_frontend_properties *c = &fe->dtv_property_cache; |
279 | u32 delsys = c->delivery_system; | 278 | u32 delsys = c->delivery_system; |
diff --git a/drivers/media/dvb/frontends/af9013.c b/drivers/media/dvb/frontends/af9013.c index 77862fe2c65e..94df6cc6f537 100644 --- a/drivers/media/dvb/frontends/af9013.c +++ b/drivers/media/dvb/frontends/af9013.c | |||
@@ -587,7 +587,7 @@ static int af9013_set_frontend(struct dvb_frontend *fe, | |||
587 | 587 | ||
588 | /* program tuner */ | 588 | /* program tuner */ |
589 | if (fe->ops.tuner_ops.set_params) | 589 | if (fe->ops.tuner_ops.set_params) |
590 | fe->ops.tuner_ops.set_params(fe, p); | 590 | fe->ops.tuner_ops.set_params(fe); |
591 | 591 | ||
592 | /* program CFOE coefficients */ | 592 | /* program CFOE coefficients */ |
593 | if (c->bandwidth_hz != state->bandwidth_hz) { | 593 | if (c->bandwidth_hz != state->bandwidth_hz) { |
diff --git a/drivers/media/dvb/frontends/atbm8830.c b/drivers/media/dvb/frontends/atbm8830.c index 1539ea1f81ac..90480d3d6fdf 100644 --- a/drivers/media/dvb/frontends/atbm8830.c +++ b/drivers/media/dvb/frontends/atbm8830.c | |||
@@ -279,7 +279,7 @@ static int atbm8830_set_fe(struct dvb_frontend *fe, | |||
279 | if (fe->ops.tuner_ops.set_params) { | 279 | if (fe->ops.tuner_ops.set_params) { |
280 | if (fe->ops.i2c_gate_ctrl) | 280 | if (fe->ops.i2c_gate_ctrl) |
281 | fe->ops.i2c_gate_ctrl(fe, 1); | 281 | fe->ops.i2c_gate_ctrl(fe, 1); |
282 | fe->ops.tuner_ops.set_params(fe, fe_params); | 282 | fe->ops.tuner_ops.set_params(fe); |
283 | if (fe->ops.i2c_gate_ctrl) | 283 | if (fe->ops.i2c_gate_ctrl) |
284 | fe->ops.i2c_gate_ctrl(fe, 0); | 284 | fe->ops.i2c_gate_ctrl(fe, 0); |
285 | } | 285 | } |
diff --git a/drivers/media/dvb/frontends/au8522_dig.c b/drivers/media/dvb/frontends/au8522_dig.c index 5c0d3989f5bd..1df9d9c4a259 100644 --- a/drivers/media/dvb/frontends/au8522_dig.c +++ b/drivers/media/dvb/frontends/au8522_dig.c | |||
@@ -596,7 +596,7 @@ static int au8522_set_frontend(struct dvb_frontend *fe, | |||
596 | if (fe->ops.tuner_ops.set_params) { | 596 | if (fe->ops.tuner_ops.set_params) { |
597 | if (fe->ops.i2c_gate_ctrl) | 597 | if (fe->ops.i2c_gate_ctrl) |
598 | fe->ops.i2c_gate_ctrl(fe, 1); | 598 | fe->ops.i2c_gate_ctrl(fe, 1); |
599 | ret = fe->ops.tuner_ops.set_params(fe, p); | 599 | ret = fe->ops.tuner_ops.set_params(fe); |
600 | if (fe->ops.i2c_gate_ctrl) | 600 | if (fe->ops.i2c_gate_ctrl) |
601 | fe->ops.i2c_gate_ctrl(fe, 0); | 601 | fe->ops.i2c_gate_ctrl(fe, 0); |
602 | } | 602 | } |
diff --git a/drivers/media/dvb/frontends/bsbe1.h b/drivers/media/dvb/frontends/bsbe1.h index e008946011b2..53e4d0dbb745 100644 --- a/drivers/media/dvb/frontends/bsbe1.h +++ b/drivers/media/dvb/frontends/bsbe1.h | |||
@@ -69,7 +69,7 @@ static int alps_bsbe1_set_symbol_rate(struct dvb_frontend* fe, u32 srate, u32 ra | |||
69 | return 0; | 69 | return 0; |
70 | } | 70 | } |
71 | 71 | ||
72 | static int alps_bsbe1_tuner_set_params(struct dvb_frontend* fe, struct dvb_frontend_parameters *params) | 72 | static int alps_bsbe1_tuner_set_params(struct dvb_frontend *fe) |
73 | { | 73 | { |
74 | struct dtv_frontend_properties *p = &fe->dtv_property_cache; | 74 | struct dtv_frontend_properties *p = &fe->dtv_property_cache; |
75 | int ret; | 75 | int ret; |
diff --git a/drivers/media/dvb/frontends/bsru6.h b/drivers/media/dvb/frontends/bsru6.h index e59544d3b846..c2a578e1314d 100644 --- a/drivers/media/dvb/frontends/bsru6.h +++ b/drivers/media/dvb/frontends/bsru6.h | |||
@@ -101,7 +101,7 @@ static int alps_bsru6_set_symbol_rate(struct dvb_frontend *fe, u32 srate, u32 ra | |||
101 | return 0; | 101 | return 0; |
102 | } | 102 | } |
103 | 103 | ||
104 | static int alps_bsru6_tuner_set_params(struct dvb_frontend *fe, struct dvb_frontend_parameters *params) | 104 | static int alps_bsru6_tuner_set_params(struct dvb_frontend *fe) |
105 | { | 105 | { |
106 | struct dtv_frontend_properties *p = &fe->dtv_property_cache; | 106 | struct dtv_frontend_properties *p = &fe->dtv_property_cache; |
107 | u8 buf[4]; | 107 | u8 buf[4]; |
diff --git a/drivers/media/dvb/frontends/cx22700.c b/drivers/media/dvb/frontends/cx22700.c index 0142214b0133..6ef82a1a15ef 100644 --- a/drivers/media/dvb/frontends/cx22700.c +++ b/drivers/media/dvb/frontends/cx22700.c | |||
@@ -326,7 +326,7 @@ static int cx22700_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_par | |||
326 | cx22700_writereg (state, 0x00, 0x00); | 326 | cx22700_writereg (state, 0x00, 0x00); |
327 | 327 | ||
328 | if (fe->ops.tuner_ops.set_params) { | 328 | if (fe->ops.tuner_ops.set_params) { |
329 | fe->ops.tuner_ops.set_params(fe, p); | 329 | fe->ops.tuner_ops.set_params(fe); |
330 | if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 0); | 330 | if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 0); |
331 | } | 331 | } |
332 | 332 | ||
diff --git a/drivers/media/dvb/frontends/cx22702.c b/drivers/media/dvb/frontends/cx22702.c index 3139558148ba..73dd87ae5b3e 100644 --- a/drivers/media/dvb/frontends/cx22702.c +++ b/drivers/media/dvb/frontends/cx22702.c | |||
@@ -267,7 +267,7 @@ static int cx22702_set_tps(struct dvb_frontend *fe, | |||
267 | struct cx22702_state *state = fe->demodulator_priv; | 267 | struct cx22702_state *state = fe->demodulator_priv; |
268 | 268 | ||
269 | if (fe->ops.tuner_ops.set_params) { | 269 | if (fe->ops.tuner_ops.set_params) { |
270 | fe->ops.tuner_ops.set_params(fe, p); | 270 | fe->ops.tuner_ops.set_params(fe); |
271 | if (fe->ops.i2c_gate_ctrl) | 271 | if (fe->ops.i2c_gate_ctrl) |
272 | fe->ops.i2c_gate_ctrl(fe, 0); | 272 | fe->ops.i2c_gate_ctrl(fe, 0); |
273 | } | 273 | } |
diff --git a/drivers/media/dvb/frontends/cx24110.c b/drivers/media/dvb/frontends/cx24110.c index bf9c999aa470..1eb9253c7bc3 100644 --- a/drivers/media/dvb/frontends/cx24110.c +++ b/drivers/media/dvb/frontends/cx24110.c | |||
@@ -537,7 +537,7 @@ static int cx24110_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_par | |||
537 | 537 | ||
538 | 538 | ||
539 | if (fe->ops.tuner_ops.set_params) { | 539 | if (fe->ops.tuner_ops.set_params) { |
540 | fe->ops.tuner_ops.set_params(fe, p); | 540 | fe->ops.tuner_ops.set_params(fe); |
541 | if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 0); | 541 | if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 0); |
542 | } | 542 | } |
543 | 543 | ||
diff --git a/drivers/media/dvb/frontends/cx24113.c b/drivers/media/dvb/frontends/cx24113.c index 07737e2f7131..4b8794fa992d 100644 --- a/drivers/media/dvb/frontends/cx24113.c +++ b/drivers/media/dvb/frontends/cx24113.c | |||
@@ -476,8 +476,7 @@ static int cx24113_init(struct dvb_frontend *fe) | |||
476 | return ret; | 476 | return ret; |
477 | } | 477 | } |
478 | 478 | ||
479 | static int cx24113_set_params(struct dvb_frontend *fe, | 479 | static int cx24113_set_params(struct dvb_frontend *fe) |
480 | struct dvb_frontend_parameters *p) | ||
481 | { | 480 | { |
482 | struct dtv_frontend_properties *c = &fe->dtv_property_cache; | 481 | struct dtv_frontend_properties *c = &fe->dtv_property_cache; |
483 | struct cx24113_state *state = fe->tuner_priv; | 482 | struct cx24113_state *state = fe->tuner_priv; |
diff --git a/drivers/media/dvb/frontends/cx24123.c b/drivers/media/dvb/frontends/cx24123.c index b1dd8acc607a..4d387d3e24d6 100644 --- a/drivers/media/dvb/frontends/cx24123.c +++ b/drivers/media/dvb/frontends/cx24123.c | |||
@@ -945,7 +945,7 @@ static int cx24123_set_frontend(struct dvb_frontend *fe, | |||
945 | if (!state->config->dont_use_pll) | 945 | if (!state->config->dont_use_pll) |
946 | cx24123_pll_tune(fe, p); | 946 | cx24123_pll_tune(fe, p); |
947 | else if (fe->ops.tuner_ops.set_params) | 947 | else if (fe->ops.tuner_ops.set_params) |
948 | fe->ops.tuner_ops.set_params(fe, p); | 948 | fe->ops.tuner_ops.set_params(fe); |
949 | else | 949 | else |
950 | err("it seems I don't have a tuner..."); | 950 | err("it seems I don't have a tuner..."); |
951 | 951 | ||
diff --git a/drivers/media/dvb/frontends/cxd2820r_c.c b/drivers/media/dvb/frontends/cxd2820r_c.c index bc13db4ef224..9d081efcc646 100644 --- a/drivers/media/dvb/frontends/cxd2820r_c.c +++ b/drivers/media/dvb/frontends/cxd2820r_c.c | |||
@@ -57,7 +57,7 @@ int cxd2820r_set_frontend_c(struct dvb_frontend *fe, | |||
57 | 57 | ||
58 | /* program tuner */ | 58 | /* program tuner */ |
59 | if (fe->ops.tuner_ops.set_params) | 59 | if (fe->ops.tuner_ops.set_params) |
60 | fe->ops.tuner_ops.set_params(fe, params); | 60 | fe->ops.tuner_ops.set_params(fe); |
61 | 61 | ||
62 | if (priv->delivery_system != SYS_DVBC_ANNEX_A) { | 62 | if (priv->delivery_system != SYS_DVBC_ANNEX_A) { |
63 | for (i = 0; i < ARRAY_SIZE(tab); i++) { | 63 | for (i = 0; i < ARRAY_SIZE(tab); i++) { |
diff --git a/drivers/media/dvb/frontends/cxd2820r_t.c b/drivers/media/dvb/frontends/cxd2820r_t.c index 4ce0576c87e4..d0b854a911e6 100644 --- a/drivers/media/dvb/frontends/cxd2820r_t.c +++ b/drivers/media/dvb/frontends/cxd2820r_t.c | |||
@@ -81,7 +81,7 @@ int cxd2820r_set_frontend_t(struct dvb_frontend *fe, | |||
81 | 81 | ||
82 | /* program tuner */ | 82 | /* program tuner */ |
83 | if (fe->ops.tuner_ops.set_params) | 83 | if (fe->ops.tuner_ops.set_params) |
84 | fe->ops.tuner_ops.set_params(fe, p); | 84 | fe->ops.tuner_ops.set_params(fe); |
85 | 85 | ||
86 | if (priv->delivery_system != SYS_DVBT) { | 86 | if (priv->delivery_system != SYS_DVBT) { |
87 | for (i = 0; i < ARRAY_SIZE(tab); i++) { | 87 | for (i = 0; i < ARRAY_SIZE(tab); i++) { |
diff --git a/drivers/media/dvb/frontends/cxd2820r_t2.c b/drivers/media/dvb/frontends/cxd2820r_t2.c index 76e3c83127e8..c62cf4df1e7d 100644 --- a/drivers/media/dvb/frontends/cxd2820r_t2.c +++ b/drivers/media/dvb/frontends/cxd2820r_t2.c | |||
@@ -99,7 +99,7 @@ int cxd2820r_set_frontend_t2(struct dvb_frontend *fe, | |||
99 | 99 | ||
100 | /* program tuner */ | 100 | /* program tuner */ |
101 | if (fe->ops.tuner_ops.set_params) | 101 | if (fe->ops.tuner_ops.set_params) |
102 | fe->ops.tuner_ops.set_params(fe, params); | 102 | fe->ops.tuner_ops.set_params(fe); |
103 | 103 | ||
104 | if (priv->delivery_system != SYS_DVBT2) { | 104 | if (priv->delivery_system != SYS_DVBT2) { |
105 | for (i = 0; i < ARRAY_SIZE(tab); i++) { | 105 | for (i = 0; i < ARRAY_SIZE(tab); i++) { |
diff --git a/drivers/media/dvb/frontends/dib0070.c b/drivers/media/dvb/frontends/dib0070.c index 4ca3441b2416..3b024bfe980a 100644 --- a/drivers/media/dvb/frontends/dib0070.c +++ b/drivers/media/dvb/frontends/dib0070.c | |||
@@ -516,7 +516,7 @@ static int dib0070_tune_digital(struct dvb_frontend *fe) | |||
516 | } | 516 | } |
517 | 517 | ||
518 | 518 | ||
519 | static int dib0070_tune(struct dvb_frontend *fe, struct dvb_frontend_parameters *p) | 519 | static int dib0070_tune(struct dvb_frontend *fe) |
520 | { | 520 | { |
521 | struct dib0070_state *state = fe->tuner_priv; | 521 | struct dib0070_state *state = fe->tuner_priv; |
522 | uint32_t ret; | 522 | uint32_t ret; |
diff --git a/drivers/media/dvb/frontends/dib0090.c b/drivers/media/dvb/frontends/dib0090.c index 2b30ab2ade5e..224d81e85091 100644 --- a/drivers/media/dvb/frontends/dib0090.c +++ b/drivers/media/dvb/frontends/dib0090.c | |||
@@ -2566,7 +2566,7 @@ static int dib0090_get_frequency(struct dvb_frontend *fe, u32 * frequency) | |||
2566 | return 0; | 2566 | return 0; |
2567 | } | 2567 | } |
2568 | 2568 | ||
2569 | static int dib0090_set_params(struct dvb_frontend *fe, struct dvb_frontend_parameters *p) | 2569 | static int dib0090_set_params(struct dvb_frontend *fe) |
2570 | { | 2570 | { |
2571 | struct dib0090_state *state = fe->tuner_priv; | 2571 | struct dib0090_state *state = fe->tuner_priv; |
2572 | u32 ret; | 2572 | u32 ret; |
diff --git a/drivers/media/dvb/frontends/dib3000mb.c b/drivers/media/dvb/frontends/dib3000mb.c index 437904cbf3e6..7403198eeb14 100644 --- a/drivers/media/dvb/frontends/dib3000mb.c +++ b/drivers/media/dvb/frontends/dib3000mb.c | |||
@@ -124,7 +124,7 @@ static int dib3000mb_set_frontend(struct dvb_frontend* fe, | |||
124 | int search_state, seq; | 124 | int search_state, seq; |
125 | 125 | ||
126 | if (tuner && fe->ops.tuner_ops.set_params) { | 126 | if (tuner && fe->ops.tuner_ops.set_params) { |
127 | fe->ops.tuner_ops.set_params(fe, fep); | 127 | fe->ops.tuner_ops.set_params(fe); |
128 | if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 0); | 128 | if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 0); |
129 | 129 | ||
130 | deb_setf("bandwidth: "); | 130 | deb_setf("bandwidth: "); |
diff --git a/drivers/media/dvb/frontends/dib3000mc.c b/drivers/media/dvb/frontends/dib3000mc.c index 088e7fadbe3d..32cd00686419 100644 --- a/drivers/media/dvb/frontends/dib3000mc.c +++ b/drivers/media/dvb/frontends/dib3000mc.c | |||
@@ -696,7 +696,7 @@ static int dib3000mc_set_frontend(struct dvb_frontend* fe, | |||
696 | state->sfn_workaround_active = buggy_sfn_workaround; | 696 | state->sfn_workaround_active = buggy_sfn_workaround; |
697 | 697 | ||
698 | if (fe->ops.tuner_ops.set_params) { | 698 | if (fe->ops.tuner_ops.set_params) { |
699 | fe->ops.tuner_ops.set_params(fe, fep); | 699 | fe->ops.tuner_ops.set_params(fe); |
700 | msleep(100); | 700 | msleep(100); |
701 | } | 701 | } |
702 | 702 | ||
diff --git a/drivers/media/dvb/frontends/dib7000m.c b/drivers/media/dvb/frontends/dib7000m.c index dbb76d75c932..a30a48255bef 100644 --- a/drivers/media/dvb/frontends/dib7000m.c +++ b/drivers/media/dvb/frontends/dib7000m.c | |||
@@ -1217,7 +1217,7 @@ static int dib7000m_set_frontend(struct dvb_frontend* fe, | |||
1217 | dib7000m_set_bandwidth(state, BANDWIDTH_TO_KHZ(fep->u.ofdm.bandwidth)); | 1217 | dib7000m_set_bandwidth(state, BANDWIDTH_TO_KHZ(fep->u.ofdm.bandwidth)); |
1218 | 1218 | ||
1219 | if (fe->ops.tuner_ops.set_params) | 1219 | if (fe->ops.tuner_ops.set_params) |
1220 | fe->ops.tuner_ops.set_params(fe, fep); | 1220 | fe->ops.tuner_ops.set_params(fe); |
1221 | 1221 | ||
1222 | /* start up the AGC */ | 1222 | /* start up the AGC */ |
1223 | state->agc_state = 0; | 1223 | state->agc_state = 0; |
diff --git a/drivers/media/dvb/frontends/dib7000p.c b/drivers/media/dvb/frontends/dib7000p.c index b5f3fb4f09ed..99832078b6a0 100644 --- a/drivers/media/dvb/frontends/dib7000p.c +++ b/drivers/media/dvb/frontends/dib7000p.c | |||
@@ -1489,7 +1489,7 @@ static int dib7000p_set_frontend(struct dvb_frontend *fe, struct dvb_frontend_pa | |||
1489 | state->sfn_workaround_active = buggy_sfn_workaround; | 1489 | state->sfn_workaround_active = buggy_sfn_workaround; |
1490 | 1490 | ||
1491 | if (fe->ops.tuner_ops.set_params) | 1491 | if (fe->ops.tuner_ops.set_params) |
1492 | fe->ops.tuner_ops.set_params(fe, fep); | 1492 | fe->ops.tuner_ops.set_params(fe); |
1493 | 1493 | ||
1494 | /* start up the AGC */ | 1494 | /* start up the AGC */ |
1495 | state->agc_state = 0; | 1495 | state->agc_state = 0; |
diff --git a/drivers/media/dvb/frontends/dib8000.c b/drivers/media/dvb/frontends/dib8000.c index b8da0c9e085e..2da2bb39cb00 100644 --- a/drivers/media/dvb/frontends/dib8000.c +++ b/drivers/media/dvb/frontends/dib8000.c | |||
@@ -2986,7 +2986,7 @@ static int dib8000_set_frontend(struct dvb_frontend *fe, struct dvb_frontend_par | |||
2986 | dib8096p_set_output_mode(state->fe[index_frontend], | 2986 | dib8096p_set_output_mode(state->fe[index_frontend], |
2987 | OUTMODE_HIGH_Z); | 2987 | OUTMODE_HIGH_Z); |
2988 | if (state->fe[index_frontend]->ops.tuner_ops.set_params) | 2988 | if (state->fe[index_frontend]->ops.tuner_ops.set_params) |
2989 | state->fe[index_frontend]->ops.tuner_ops.set_params(state->fe[index_frontend], fep); | 2989 | state->fe[index_frontend]->ops.tuner_ops.set_params(state->fe[index_frontend]); |
2990 | 2990 | ||
2991 | dib8000_set_tune_state(state->fe[index_frontend], CT_AGC_START); | 2991 | dib8000_set_tune_state(state->fe[index_frontend], CT_AGC_START); |
2992 | } | 2992 | } |
diff --git a/drivers/media/dvb/frontends/drxd_hard.c b/drivers/media/dvb/frontends/drxd_hard.c index beb67759f824..955d3a58c659 100644 --- a/drivers/media/dvb/frontends/drxd_hard.c +++ b/drivers/media/dvb/frontends/drxd_hard.c | |||
@@ -2907,7 +2907,7 @@ static int drxd_set_frontend(struct dvb_frontend *fe, | |||
2907 | DRX_Stop(state); | 2907 | DRX_Stop(state); |
2908 | 2908 | ||
2909 | if (fe->ops.tuner_ops.set_params) { | 2909 | if (fe->ops.tuner_ops.set_params) { |
2910 | fe->ops.tuner_ops.set_params(fe, param); | 2910 | fe->ops.tuner_ops.set_params(fe); |
2911 | if (fe->ops.i2c_gate_ctrl) | 2911 | if (fe->ops.i2c_gate_ctrl) |
2912 | fe->ops.i2c_gate_ctrl(fe, 0); | 2912 | fe->ops.i2c_gate_ctrl(fe, 0); |
2913 | } | 2913 | } |
diff --git a/drivers/media/dvb/frontends/drxk_hard.c b/drivers/media/dvb/frontends/drxk_hard.c index d795898c0668..83b8474667ac 100644 --- a/drivers/media/dvb/frontends/drxk_hard.c +++ b/drivers/media/dvb/frontends/drxk_hard.c | |||
@@ -6240,7 +6240,7 @@ static int drxk_set_parameters(struct dvb_frontend *fe, | |||
6240 | if (fe->ops.i2c_gate_ctrl) | 6240 | if (fe->ops.i2c_gate_ctrl) |
6241 | fe->ops.i2c_gate_ctrl(fe, 1); | 6241 | fe->ops.i2c_gate_ctrl(fe, 1); |
6242 | if (fe->ops.tuner_ops.set_params) | 6242 | if (fe->ops.tuner_ops.set_params) |
6243 | fe->ops.tuner_ops.set_params(fe, p); | 6243 | fe->ops.tuner_ops.set_params(fe); |
6244 | if (fe->ops.i2c_gate_ctrl) | 6244 | if (fe->ops.i2c_gate_ctrl) |
6245 | fe->ops.i2c_gate_ctrl(fe, 0); | 6245 | fe->ops.i2c_gate_ctrl(fe, 0); |
6246 | state->param = *p; | 6246 | state->param = *p; |
diff --git a/drivers/media/dvb/frontends/dvb-pll.c b/drivers/media/dvb/frontends/dvb-pll.c index f967cf9b4a60..978805ed3847 100644 --- a/drivers/media/dvb/frontends/dvb-pll.c +++ b/drivers/media/dvb/frontends/dvb-pll.c | |||
@@ -608,8 +608,7 @@ static int dvb_pll_sleep(struct dvb_frontend *fe) | |||
608 | return -EINVAL; | 608 | return -EINVAL; |
609 | } | 609 | } |
610 | 610 | ||
611 | static int dvb_pll_set_params(struct dvb_frontend *fe, | 611 | static int dvb_pll_set_params(struct dvb_frontend *fe) |
612 | struct dvb_frontend_parameters *params) | ||
613 | { | 612 | { |
614 | struct dtv_frontend_properties *c = &fe->dtv_property_cache; | 613 | struct dtv_frontend_properties *c = &fe->dtv_property_cache; |
615 | struct dvb_pll_priv *priv = fe->tuner_priv; | 614 | struct dvb_pll_priv *priv = fe->tuner_priv; |
diff --git a/drivers/media/dvb/frontends/dvb_dummy_fe.c b/drivers/media/dvb/frontends/dvb_dummy_fe.c index a7fc7e53a551..e3a7e424f82f 100644 --- a/drivers/media/dvb/frontends/dvb_dummy_fe.c +++ b/drivers/media/dvb/frontends/dvb_dummy_fe.c | |||
@@ -76,7 +76,7 @@ static int dvb_dummy_fe_get_frontend(struct dvb_frontend* fe, struct dvb_fronten | |||
76 | static int dvb_dummy_fe_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_parameters *p) | 76 | static int dvb_dummy_fe_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_parameters *p) |
77 | { | 77 | { |
78 | if (fe->ops.tuner_ops.set_params) { | 78 | if (fe->ops.tuner_ops.set_params) { |
79 | fe->ops.tuner_ops.set_params(fe, p); | 79 | fe->ops.tuner_ops.set_params(fe); |
80 | if (fe->ops.i2c_gate_ctrl) | 80 | if (fe->ops.i2c_gate_ctrl) |
81 | fe->ops.i2c_gate_ctrl(fe, 0); | 81 | fe->ops.i2c_gate_ctrl(fe, 0); |
82 | } | 82 | } |
diff --git a/drivers/media/dvb/frontends/ec100.c b/drivers/media/dvb/frontends/ec100.c index 2414dc6ee5d9..1ef79f0208e2 100644 --- a/drivers/media/dvb/frontends/ec100.c +++ b/drivers/media/dvb/frontends/ec100.c | |||
@@ -88,7 +88,7 @@ static int ec100_set_frontend(struct dvb_frontend *fe, | |||
88 | 88 | ||
89 | /* program tuner */ | 89 | /* program tuner */ |
90 | if (fe->ops.tuner_ops.set_params) | 90 | if (fe->ops.tuner_ops.set_params) |
91 | fe->ops.tuner_ops.set_params(fe, params); | 91 | fe->ops.tuner_ops.set_params(fe); |
92 | 92 | ||
93 | ret = ec100_write_reg(state, 0x04, 0x06); | 93 | ret = ec100_write_reg(state, 0x04, 0x06); |
94 | if (ret) | 94 | if (ret) |
diff --git a/drivers/media/dvb/frontends/it913x-fe.c b/drivers/media/dvb/frontends/it913x-fe.c index 8088e62a2028..8857710b90e4 100644 --- a/drivers/media/dvb/frontends/it913x-fe.c +++ b/drivers/media/dvb/frontends/it913x-fe.c | |||
@@ -642,7 +642,7 @@ static int it913x_fe_set_frontend(struct dvb_frontend *fe, | |||
642 | break; | 642 | break; |
643 | default: | 643 | default: |
644 | if (fe->ops.tuner_ops.set_params) { | 644 | if (fe->ops.tuner_ops.set_params) { |
645 | fe->ops.tuner_ops.set_params(fe, p); | 645 | fe->ops.tuner_ops.set_params(fe); |
646 | if (fe->ops.i2c_gate_ctrl) | 646 | if (fe->ops.i2c_gate_ctrl) |
647 | fe->ops.i2c_gate_ctrl(fe, 0); | 647 | fe->ops.i2c_gate_ctrl(fe, 0); |
648 | } | 648 | } |
diff --git a/drivers/media/dvb/frontends/itd1000.c b/drivers/media/dvb/frontends/itd1000.c index afe7cc0d859e..316457584fe7 100644 --- a/drivers/media/dvb/frontends/itd1000.c +++ b/drivers/media/dvb/frontends/itd1000.c | |||
@@ -250,7 +250,7 @@ static void itd1000_set_lo(struct itd1000_state *state, u32 freq_khz) | |||
250 | itd1000_set_vco(state, freq_khz); | 250 | itd1000_set_vco(state, freq_khz); |
251 | } | 251 | } |
252 | 252 | ||
253 | static int itd1000_set_parameters(struct dvb_frontend *fe, struct dvb_frontend_parameters *p) | 253 | static int itd1000_set_parameters(struct dvb_frontend *fe) |
254 | { | 254 | { |
255 | struct dtv_frontend_properties *c = &fe->dtv_property_cache; | 255 | struct dtv_frontend_properties *c = &fe->dtv_property_cache; |
256 | struct itd1000_state *state = fe->tuner_priv; | 256 | struct itd1000_state *state = fe->tuner_priv; |
diff --git a/drivers/media/dvb/frontends/ix2505v.c b/drivers/media/dvb/frontends/ix2505v.c index aca48172504c..bc5a82082aaa 100644 --- a/drivers/media/dvb/frontends/ix2505v.c +++ b/drivers/media/dvb/frontends/ix2505v.c | |||
@@ -129,8 +129,7 @@ static int ix2505v_release(struct dvb_frontend *fe) | |||
129 | * 1 -> 8 -> 6 | 129 | * 1 -> 8 -> 6 |
130 | */ | 130 | */ |
131 | 131 | ||
132 | static int ix2505v_set_params(struct dvb_frontend *fe, | 132 | static int ix2505v_set_params(struct dvb_frontend *fe) |
133 | struct dvb_frontend_parameters *params) | ||
134 | { | 133 | { |
135 | struct dtv_frontend_properties *c = &fe->dtv_property_cache; | 134 | struct dtv_frontend_properties *c = &fe->dtv_property_cache; |
136 | struct ix2505v_state *state = fe->tuner_priv; | 135 | struct ix2505v_state *state = fe->tuner_priv; |
diff --git a/drivers/media/dvb/frontends/l64781.c b/drivers/media/dvb/frontends/l64781.c index 445fa1068064..eee6bb54503f 100644 --- a/drivers/media/dvb/frontends/l64781.c +++ b/drivers/media/dvb/frontends/l64781.c | |||
@@ -140,7 +140,7 @@ static int apply_frontend_param (struct dvb_frontend* fe, struct dvb_frontend_pa | |||
140 | int bw = p->bandwidth - BANDWIDTH_8_MHZ; | 140 | int bw = p->bandwidth - BANDWIDTH_8_MHZ; |
141 | 141 | ||
142 | if (fe->ops.tuner_ops.set_params) { | 142 | if (fe->ops.tuner_ops.set_params) { |
143 | fe->ops.tuner_ops.set_params(fe, param); | 143 | fe->ops.tuner_ops.set_params(fe); |
144 | if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 0); | 144 | if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 0); |
145 | } | 145 | } |
146 | 146 | ||
diff --git a/drivers/media/dvb/frontends/lgdt3305.c b/drivers/media/dvb/frontends/lgdt3305.c index 3272881cb112..321f9911ba92 100644 --- a/drivers/media/dvb/frontends/lgdt3305.c +++ b/drivers/media/dvb/frontends/lgdt3305.c | |||
@@ -686,7 +686,7 @@ static int lgdt3304_set_parameters(struct dvb_frontend *fe, | |||
686 | lg_dbg("(%d, %d)\n", param->frequency, param->u.vsb.modulation); | 686 | lg_dbg("(%d, %d)\n", param->frequency, param->u.vsb.modulation); |
687 | 687 | ||
688 | if (fe->ops.tuner_ops.set_params) { | 688 | if (fe->ops.tuner_ops.set_params) { |
689 | ret = fe->ops.tuner_ops.set_params(fe, param); | 689 | ret = fe->ops.tuner_ops.set_params(fe); |
690 | if (fe->ops.i2c_gate_ctrl) | 690 | if (fe->ops.i2c_gate_ctrl) |
691 | fe->ops.i2c_gate_ctrl(fe, 0); | 691 | fe->ops.i2c_gate_ctrl(fe, 0); |
692 | if (lg_fail(ret)) | 692 | if (lg_fail(ret)) |
@@ -756,7 +756,7 @@ static int lgdt3305_set_parameters(struct dvb_frontend *fe, | |||
756 | lg_dbg("(%d, %d)\n", param->frequency, param->u.vsb.modulation); | 756 | lg_dbg("(%d, %d)\n", param->frequency, param->u.vsb.modulation); |
757 | 757 | ||
758 | if (fe->ops.tuner_ops.set_params) { | 758 | if (fe->ops.tuner_ops.set_params) { |
759 | ret = fe->ops.tuner_ops.set_params(fe, param); | 759 | ret = fe->ops.tuner_ops.set_params(fe); |
760 | if (fe->ops.i2c_gate_ctrl) | 760 | if (fe->ops.i2c_gate_ctrl) |
761 | fe->ops.i2c_gate_ctrl(fe, 0); | 761 | fe->ops.i2c_gate_ctrl(fe, 0); |
762 | if (lg_fail(ret)) | 762 | if (lg_fail(ret)) |
diff --git a/drivers/media/dvb/frontends/lgdt330x.c b/drivers/media/dvb/frontends/lgdt330x.c index c39d8d63979b..ab3971264e36 100644 --- a/drivers/media/dvb/frontends/lgdt330x.c +++ b/drivers/media/dvb/frontends/lgdt330x.c | |||
@@ -424,7 +424,7 @@ static int lgdt330x_set_parameters(struct dvb_frontend* fe, | |||
424 | 424 | ||
425 | /* Tune to the specified frequency */ | 425 | /* Tune to the specified frequency */ |
426 | if (fe->ops.tuner_ops.set_params) { | 426 | if (fe->ops.tuner_ops.set_params) { |
427 | fe->ops.tuner_ops.set_params(fe, param); | 427 | fe->ops.tuner_ops.set_params(fe); |
428 | if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 0); | 428 | if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 0); |
429 | } | 429 | } |
430 | 430 | ||
diff --git a/drivers/media/dvb/frontends/lgs8gl5.c b/drivers/media/dvb/frontends/lgs8gl5.c index bb37ed289a05..4a9bd999942f 100644 --- a/drivers/media/dvb/frontends/lgs8gl5.c +++ b/drivers/media/dvb/frontends/lgs8gl5.c | |||
@@ -322,7 +322,7 @@ lgs8gl5_set_frontend(struct dvb_frontend *fe, | |||
322 | return -EINVAL; | 322 | return -EINVAL; |
323 | 323 | ||
324 | if (fe->ops.tuner_ops.set_params) { | 324 | if (fe->ops.tuner_ops.set_params) { |
325 | fe->ops.tuner_ops.set_params(fe, p); | 325 | fe->ops.tuner_ops.set_params(fe); |
326 | if (fe->ops.i2c_gate_ctrl) | 326 | if (fe->ops.i2c_gate_ctrl) |
327 | fe->ops.i2c_gate_ctrl(fe, 0); | 327 | fe->ops.i2c_gate_ctrl(fe, 0); |
328 | } | 328 | } |
diff --git a/drivers/media/dvb/frontends/lgs8gxx.c b/drivers/media/dvb/frontends/lgs8gxx.c index 1172b54689f8..bf9b12b00a93 100644 --- a/drivers/media/dvb/frontends/lgs8gxx.c +++ b/drivers/media/dvb/frontends/lgs8gxx.c | |||
@@ -678,7 +678,7 @@ static int lgs8gxx_set_fe(struct dvb_frontend *fe, | |||
678 | 678 | ||
679 | /* set frequency */ | 679 | /* set frequency */ |
680 | if (fe->ops.tuner_ops.set_params) { | 680 | if (fe->ops.tuner_ops.set_params) { |
681 | fe->ops.tuner_ops.set_params(fe, fe_params); | 681 | fe->ops.tuner_ops.set_params(fe); |
682 | if (fe->ops.i2c_gate_ctrl) | 682 | if (fe->ops.i2c_gate_ctrl) |
683 | fe->ops.i2c_gate_ctrl(fe, 0); | 683 | fe->ops.i2c_gate_ctrl(fe, 0); |
684 | } | 684 | } |
diff --git a/drivers/media/dvb/frontends/mb86a20s.c b/drivers/media/dvb/frontends/mb86a20s.c index 0f867a5055fb..8c92070988e4 100644 --- a/drivers/media/dvb/frontends/mb86a20s.c +++ b/drivers/media/dvb/frontends/mb86a20s.c | |||
@@ -496,7 +496,7 @@ static int mb86a20s_set_frontend(struct dvb_frontend *fe, | |||
496 | if (fe->ops.i2c_gate_ctrl) | 496 | if (fe->ops.i2c_gate_ctrl) |
497 | fe->ops.i2c_gate_ctrl(fe, 1); | 497 | fe->ops.i2c_gate_ctrl(fe, 1); |
498 | dprintk("Calling tuner set parameters\n"); | 498 | dprintk("Calling tuner set parameters\n"); |
499 | fe->ops.tuner_ops.set_params(fe, p); | 499 | fe->ops.tuner_ops.set_params(fe); |
500 | 500 | ||
501 | /* | 501 | /* |
502 | * Make it more reliable: if, for some reason, the initial | 502 | * Make it more reliable: if, for some reason, the initial |
diff --git a/drivers/media/dvb/frontends/mt312.c b/drivers/media/dvb/frontends/mt312.c index 83e6f1a1b700..302d72a81b48 100644 --- a/drivers/media/dvb/frontends/mt312.c +++ b/drivers/media/dvb/frontends/mt312.c | |||
@@ -603,7 +603,7 @@ static int mt312_set_frontend(struct dvb_frontend *fe, | |||
603 | } | 603 | } |
604 | 604 | ||
605 | if (fe->ops.tuner_ops.set_params) { | 605 | if (fe->ops.tuner_ops.set_params) { |
606 | fe->ops.tuner_ops.set_params(fe, p); | 606 | fe->ops.tuner_ops.set_params(fe); |
607 | if (fe->ops.i2c_gate_ctrl) | 607 | if (fe->ops.i2c_gate_ctrl) |
608 | fe->ops.i2c_gate_ctrl(fe, 0); | 608 | fe->ops.i2c_gate_ctrl(fe, 0); |
609 | } | 609 | } |
diff --git a/drivers/media/dvb/frontends/mt352.c b/drivers/media/dvb/frontends/mt352.c index e2a86daba502..16a9fac2ba6c 100644 --- a/drivers/media/dvb/frontends/mt352.c +++ b/drivers/media/dvb/frontends/mt352.c | |||
@@ -293,7 +293,7 @@ static int mt352_set_parameters(struct dvb_frontend* fe, | |||
293 | 293 | ||
294 | if (state->config.no_tuner) { | 294 | if (state->config.no_tuner) { |
295 | if (fe->ops.tuner_ops.set_params) { | 295 | if (fe->ops.tuner_ops.set_params) { |
296 | fe->ops.tuner_ops.set_params(fe, param); | 296 | fe->ops.tuner_ops.set_params(fe); |
297 | if (fe->ops.i2c_gate_ctrl) | 297 | if (fe->ops.i2c_gate_ctrl) |
298 | fe->ops.i2c_gate_ctrl(fe, 0); | 298 | fe->ops.i2c_gate_ctrl(fe, 0); |
299 | } | 299 | } |
diff --git a/drivers/media/dvb/frontends/nxt6000.c b/drivers/media/dvb/frontends/nxt6000.c index 6599b8fea9e9..d17dd2ddc2f2 100644 --- a/drivers/media/dvb/frontends/nxt6000.c +++ b/drivers/media/dvb/frontends/nxt6000.c | |||
@@ -463,7 +463,7 @@ static int nxt6000_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_par | |||
463 | int result; | 463 | int result; |
464 | 464 | ||
465 | if (fe->ops.tuner_ops.set_params) { | 465 | if (fe->ops.tuner_ops.set_params) { |
466 | fe->ops.tuner_ops.set_params(fe, param); | 466 | fe->ops.tuner_ops.set_params(fe); |
467 | if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 0); | 467 | if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 0); |
468 | } | 468 | } |
469 | 469 | ||
diff --git a/drivers/media/dvb/frontends/or51132.c b/drivers/media/dvb/frontends/or51132.c index 38e67accb8c3..5cd965b05ee8 100644 --- a/drivers/media/dvb/frontends/or51132.c +++ b/drivers/media/dvb/frontends/or51132.c | |||
@@ -363,7 +363,7 @@ static int or51132_set_parameters(struct dvb_frontend* fe, | |||
363 | } | 363 | } |
364 | 364 | ||
365 | if (fe->ops.tuner_ops.set_params) { | 365 | if (fe->ops.tuner_ops.set_params) { |
366 | fe->ops.tuner_ops.set_params(fe, param); | 366 | fe->ops.tuner_ops.set_params(fe); |
367 | if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 0); | 367 | if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 0); |
368 | } | 368 | } |
369 | 369 | ||
diff --git a/drivers/media/dvb/frontends/or51211.c b/drivers/media/dvb/frontends/or51211.c index c709ce6771c8..92d4dd8bba40 100644 --- a/drivers/media/dvb/frontends/or51211.c +++ b/drivers/media/dvb/frontends/or51211.c | |||
@@ -226,7 +226,7 @@ static int or51211_set_parameters(struct dvb_frontend* fe, | |||
226 | /* Change only if we are actually changing the channel */ | 226 | /* Change only if we are actually changing the channel */ |
227 | if (state->current_frequency != param->frequency) { | 227 | if (state->current_frequency != param->frequency) { |
228 | if (fe->ops.tuner_ops.set_params) { | 228 | if (fe->ops.tuner_ops.set_params) { |
229 | fe->ops.tuner_ops.set_params(fe, param); | 229 | fe->ops.tuner_ops.set_params(fe); |
230 | if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 0); | 230 | if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 0); |
231 | } | 231 | } |
232 | 232 | ||
diff --git a/drivers/media/dvb/frontends/s5h1409.c b/drivers/media/dvb/frontends/s5h1409.c index 0d6d5e3e2c31..5ffb19e86c16 100644 --- a/drivers/media/dvb/frontends/s5h1409.c +++ b/drivers/media/dvb/frontends/s5h1409.c | |||
@@ -647,7 +647,7 @@ static int s5h1409_set_frontend(struct dvb_frontend *fe, | |||
647 | if (fe->ops.tuner_ops.set_params) { | 647 | if (fe->ops.tuner_ops.set_params) { |
648 | if (fe->ops.i2c_gate_ctrl) | 648 | if (fe->ops.i2c_gate_ctrl) |
649 | fe->ops.i2c_gate_ctrl(fe, 1); | 649 | fe->ops.i2c_gate_ctrl(fe, 1); |
650 | fe->ops.tuner_ops.set_params(fe, p); | 650 | fe->ops.tuner_ops.set_params(fe); |
651 | if (fe->ops.i2c_gate_ctrl) | 651 | if (fe->ops.i2c_gate_ctrl) |
652 | fe->ops.i2c_gate_ctrl(fe, 0); | 652 | fe->ops.i2c_gate_ctrl(fe, 0); |
653 | } | 653 | } |
diff --git a/drivers/media/dvb/frontends/s5h1411.c b/drivers/media/dvb/frontends/s5h1411.c index 5fca113a2013..6852abe24ab8 100644 --- a/drivers/media/dvb/frontends/s5h1411.c +++ b/drivers/media/dvb/frontends/s5h1411.c | |||
@@ -602,7 +602,7 @@ static int s5h1411_set_frontend(struct dvb_frontend *fe, | |||
602 | if (fe->ops.i2c_gate_ctrl) | 602 | if (fe->ops.i2c_gate_ctrl) |
603 | fe->ops.i2c_gate_ctrl(fe, 1); | 603 | fe->ops.i2c_gate_ctrl(fe, 1); |
604 | 604 | ||
605 | fe->ops.tuner_ops.set_params(fe, p); | 605 | fe->ops.tuner_ops.set_params(fe); |
606 | 606 | ||
607 | if (fe->ops.i2c_gate_ctrl) | 607 | if (fe->ops.i2c_gate_ctrl) |
608 | fe->ops.i2c_gate_ctrl(fe, 0); | 608 | fe->ops.i2c_gate_ctrl(fe, 0); |
diff --git a/drivers/media/dvb/frontends/s5h1420.c b/drivers/media/dvb/frontends/s5h1420.c index 3879d2e378aa..c4a8a01a6ca6 100644 --- a/drivers/media/dvb/frontends/s5h1420.c +++ b/drivers/media/dvb/frontends/s5h1420.c | |||
@@ -649,7 +649,7 @@ static int s5h1420_set_frontend(struct dvb_frontend* fe, | |||
649 | (state->symbol_rate == p->u.qpsk.symbol_rate)) { | 649 | (state->symbol_rate == p->u.qpsk.symbol_rate)) { |
650 | 650 | ||
651 | if (fe->ops.tuner_ops.set_params) { | 651 | if (fe->ops.tuner_ops.set_params) { |
652 | fe->ops.tuner_ops.set_params(fe, p); | 652 | fe->ops.tuner_ops.set_params(fe); |
653 | if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 0); | 653 | if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 0); |
654 | } | 654 | } |
655 | if (fe->ops.tuner_ops.get_frequency) { | 655 | if (fe->ops.tuner_ops.get_frequency) { |
@@ -744,7 +744,7 @@ static int s5h1420_set_frontend(struct dvb_frontend* fe, | |||
744 | 744 | ||
745 | /* set tuner PLL */ | 745 | /* set tuner PLL */ |
746 | if (fe->ops.tuner_ops.set_params) { | 746 | if (fe->ops.tuner_ops.set_params) { |
747 | fe->ops.tuner_ops.set_params(fe, p); | 747 | fe->ops.tuner_ops.set_params(fe); |
748 | if (fe->ops.i2c_gate_ctrl) | 748 | if (fe->ops.i2c_gate_ctrl) |
749 | fe->ops.i2c_gate_ctrl(fe, 0); | 749 | fe->ops.i2c_gate_ctrl(fe, 0); |
750 | s5h1420_setfreqoffset(state, 0); | 750 | s5h1420_setfreqoffset(state, 0); |
diff --git a/drivers/media/dvb/frontends/s5h1432.c b/drivers/media/dvb/frontends/s5h1432.c index 0c6dcb90d168..2717bae1e514 100644 --- a/drivers/media/dvb/frontends/s5h1432.c +++ b/drivers/media/dvb/frontends/s5h1432.c | |||
@@ -188,7 +188,7 @@ static int s5h1432_set_frontend(struct dvb_frontend *fe, | |||
188 | /*current_frequency = p->frequency; */ | 188 | /*current_frequency = p->frequency; */ |
189 | /*state->current_frequency = p->frequency; */ | 189 | /*state->current_frequency = p->frequency; */ |
190 | } else { | 190 | } else { |
191 | fe->ops.tuner_ops.set_params(fe, p); | 191 | fe->ops.tuner_ops.set_params(fe); |
192 | msleep(300); | 192 | msleep(300); |
193 | s5h1432_set_channel_bandwidth(fe, dvb_bandwidth); | 193 | s5h1432_set_channel_bandwidth(fe, dvb_bandwidth); |
194 | switch (p->u.ofdm.bandwidth) { | 194 | switch (p->u.ofdm.bandwidth) { |
@@ -207,7 +207,7 @@ static int s5h1432_set_frontend(struct dvb_frontend *fe, | |||
207 | default: | 207 | default: |
208 | return 0; | 208 | return 0; |
209 | } | 209 | } |
210 | /*fe->ops.tuner_ops.set_params(fe, p); */ | 210 | /*fe->ops.tuner_ops.set_params(fe); */ |
211 | /*Soft Reset chip*/ | 211 | /*Soft Reset chip*/ |
212 | msleep(30); | 212 | msleep(30); |
213 | s5h1432_writereg(state, S5H1432_I2C_TOP_ADDR, 0x09, 0x1a); | 213 | s5h1432_writereg(state, S5H1432_I2C_TOP_ADDR, 0x09, 0x1a); |
@@ -231,7 +231,7 @@ static int s5h1432_set_frontend(struct dvb_frontend *fe, | |||
231 | default: | 231 | default: |
232 | return 0; | 232 | return 0; |
233 | } | 233 | } |
234 | /*fe->ops.tuner_ops.set_params(fe,p); */ | 234 | /*fe->ops.tuner_ops.set_params(fe); */ |
235 | /*Soft Reset chip*/ | 235 | /*Soft Reset chip*/ |
236 | msleep(30); | 236 | msleep(30); |
237 | s5h1432_writereg(state, S5H1432_I2C_TOP_ADDR, 0x09, 0x1a); | 237 | s5h1432_writereg(state, S5H1432_I2C_TOP_ADDR, 0x09, 0x1a); |
diff --git a/drivers/media/dvb/frontends/sp8870.c b/drivers/media/dvb/frontends/sp8870.c index b85eb60a893e..9cff9098a41b 100644 --- a/drivers/media/dvb/frontends/sp8870.c +++ b/drivers/media/dvb/frontends/sp8870.c | |||
@@ -260,7 +260,7 @@ static int sp8870_set_frontend_parameters (struct dvb_frontend* fe, | |||
260 | 260 | ||
261 | // set tuner parameters | 261 | // set tuner parameters |
262 | if (fe->ops.tuner_ops.set_params) { | 262 | if (fe->ops.tuner_ops.set_params) { |
263 | fe->ops.tuner_ops.set_params(fe, p); | 263 | fe->ops.tuner_ops.set_params(fe); |
264 | if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 0); | 264 | if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 0); |
265 | } | 265 | } |
266 | 266 | ||
diff --git a/drivers/media/dvb/frontends/sp887x.c b/drivers/media/dvb/frontends/sp887x.c index 4a7c3d842608..efe09268296b 100644 --- a/drivers/media/dvb/frontends/sp887x.c +++ b/drivers/media/dvb/frontends/sp887x.c | |||
@@ -353,7 +353,7 @@ static int sp887x_setup_frontend_parameters (struct dvb_frontend* fe, | |||
353 | 353 | ||
354 | /* setup the PLL */ | 354 | /* setup the PLL */ |
355 | if (fe->ops.tuner_ops.set_params) { | 355 | if (fe->ops.tuner_ops.set_params) { |
356 | fe->ops.tuner_ops.set_params(fe, p); | 356 | fe->ops.tuner_ops.set_params(fe); |
357 | if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 0); | 357 | if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 0); |
358 | } | 358 | } |
359 | if (fe->ops.tuner_ops.get_frequency) { | 359 | if (fe->ops.tuner_ops.get_frequency) { |
diff --git a/drivers/media/dvb/frontends/stb6000.c b/drivers/media/dvb/frontends/stb6000.c index d4f4ebbfce3a..a0c3c526b132 100644 --- a/drivers/media/dvb/frontends/stb6000.c +++ b/drivers/media/dvb/frontends/stb6000.c | |||
@@ -75,8 +75,7 @@ static int stb6000_sleep(struct dvb_frontend *fe) | |||
75 | return (ret == 1) ? 0 : ret; | 75 | return (ret == 1) ? 0 : ret; |
76 | } | 76 | } |
77 | 77 | ||
78 | static int stb6000_set_params(struct dvb_frontend *fe, | 78 | static int stb6000_set_params(struct dvb_frontend *fe) |
79 | struct dvb_frontend_parameters *params) | ||
80 | { | 79 | { |
81 | struct dtv_frontend_properties *p = &fe->dtv_property_cache; | 80 | struct dtv_frontend_properties *p = &fe->dtv_property_cache; |
82 | struct stb6000_priv *priv = fe->tuner_priv; | 81 | struct stb6000_priv *priv = fe->tuner_priv; |
diff --git a/drivers/media/dvb/frontends/stv0288.c b/drivers/media/dvb/frontends/stv0288.c index 0aa3962ff18b..a1b493391f45 100644 --- a/drivers/media/dvb/frontends/stv0288.c +++ b/drivers/media/dvb/frontends/stv0288.c | |||
@@ -484,7 +484,7 @@ static int stv0288_set_frontend(struct dvb_frontend *fe, | |||
484 | dfp->frequency = c->frequency; | 484 | dfp->frequency = c->frequency; |
485 | dfp->u.qpsk.symbol_rate = c->symbol_rate; | 485 | dfp->u.qpsk.symbol_rate = c->symbol_rate; |
486 | if (fe->ops.tuner_ops.set_params) { | 486 | if (fe->ops.tuner_ops.set_params) { |
487 | fe->ops.tuner_ops.set_params(fe, dfp); | 487 | fe->ops.tuner_ops.set_params(fe); |
488 | if (fe->ops.i2c_gate_ctrl) | 488 | if (fe->ops.i2c_gate_ctrl) |
489 | fe->ops.i2c_gate_ctrl(fe, 0); | 489 | fe->ops.i2c_gate_ctrl(fe, 0); |
490 | } | 490 | } |
diff --git a/drivers/media/dvb/frontends/stv0297.c b/drivers/media/dvb/frontends/stv0297.c index 84d88f33275e..daeaddf6f883 100644 --- a/drivers/media/dvb/frontends/stv0297.c +++ b/drivers/media/dvb/frontends/stv0297.c | |||
@@ -455,7 +455,7 @@ static int stv0297_set_frontend(struct dvb_frontend *fe, struct dvb_frontend_par | |||
455 | 455 | ||
456 | stv0297_init(fe); | 456 | stv0297_init(fe); |
457 | if (fe->ops.tuner_ops.set_params) { | 457 | if (fe->ops.tuner_ops.set_params) { |
458 | fe->ops.tuner_ops.set_params(fe, p); | 458 | fe->ops.tuner_ops.set_params(fe); |
459 | if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 0); | 459 | if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 0); |
460 | } | 460 | } |
461 | 461 | ||
diff --git a/drivers/media/dvb/frontends/stv0299.c b/drivers/media/dvb/frontends/stv0299.c index 42684bec8883..bd79e05cdc7e 100644 --- a/drivers/media/dvb/frontends/stv0299.c +++ b/drivers/media/dvb/frontends/stv0299.c | |||
@@ -579,7 +579,7 @@ static int stv0299_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_par | |||
579 | stv0299_writeregI(state, 0x0c, (stv0299_readreg(state, 0x0c) & 0xfe) | invval); | 579 | stv0299_writeregI(state, 0x0c, (stv0299_readreg(state, 0x0c) & 0xfe) | invval); |
580 | 580 | ||
581 | if (fe->ops.tuner_ops.set_params) { | 581 | if (fe->ops.tuner_ops.set_params) { |
582 | fe->ops.tuner_ops.set_params(fe, p); | 582 | fe->ops.tuner_ops.set_params(fe); |
583 | if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 0); | 583 | if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 0); |
584 | } | 584 | } |
585 | 585 | ||
diff --git a/drivers/media/dvb/frontends/stv0367.c b/drivers/media/dvb/frontends/stv0367.c index e57ab53e2e27..586295df7cab 100644 --- a/drivers/media/dvb/frontends/stv0367.c +++ b/drivers/media/dvb/frontends/stv0367.c | |||
@@ -1822,7 +1822,7 @@ static int stv0367ter_set_frontend(struct dvb_frontend *fe, | |||
1822 | if (fe->ops.tuner_ops.set_params) { | 1822 | if (fe->ops.tuner_ops.set_params) { |
1823 | if (fe->ops.i2c_gate_ctrl) | 1823 | if (fe->ops.i2c_gate_ctrl) |
1824 | fe->ops.i2c_gate_ctrl(fe, 1); | 1824 | fe->ops.i2c_gate_ctrl(fe, 1); |
1825 | fe->ops.tuner_ops.set_params(fe, param); | 1825 | fe->ops.tuner_ops.set_params(fe); |
1826 | if (fe->ops.i2c_gate_ctrl) | 1826 | if (fe->ops.i2c_gate_ctrl) |
1827 | fe->ops.i2c_gate_ctrl(fe, 0); | 1827 | fe->ops.i2c_gate_ctrl(fe, 0); |
1828 | } | 1828 | } |
@@ -3120,7 +3120,7 @@ static int stv0367cab_set_frontend(struct dvb_frontend *fe, | |||
3120 | if (fe->ops.tuner_ops.set_params) { | 3120 | if (fe->ops.tuner_ops.set_params) { |
3121 | if (fe->ops.i2c_gate_ctrl) | 3121 | if (fe->ops.i2c_gate_ctrl) |
3122 | fe->ops.i2c_gate_ctrl(fe, 1); | 3122 | fe->ops.i2c_gate_ctrl(fe, 1); |
3123 | fe->ops.tuner_ops.set_params(fe, param); | 3123 | fe->ops.tuner_ops.set_params(fe); |
3124 | if (fe->ops.i2c_gate_ctrl) | 3124 | if (fe->ops.i2c_gate_ctrl) |
3125 | fe->ops.i2c_gate_ctrl(fe, 0); | 3125 | fe->ops.i2c_gate_ctrl(fe, 0); |
3126 | } | 3126 | } |
diff --git a/drivers/media/dvb/frontends/stv6110.c b/drivers/media/dvb/frontends/stv6110.c index 2dca7c8e5148..20b5fa92c53e 100644 --- a/drivers/media/dvb/frontends/stv6110.c +++ b/drivers/media/dvb/frontends/stv6110.c | |||
@@ -347,8 +347,7 @@ static int stv6110_set_frequency(struct dvb_frontend *fe, u32 frequency) | |||
347 | return 0; | 347 | return 0; |
348 | } | 348 | } |
349 | 349 | ||
350 | static int stv6110_set_params(struct dvb_frontend *fe, | 350 | static int stv6110_set_params(struct dvb_frontend *fe) |
351 | struct dvb_frontend_parameters *params) | ||
352 | { | 351 | { |
353 | struct dtv_frontend_properties *c = &fe->dtv_property_cache; | 352 | struct dtv_frontend_properties *c = &fe->dtv_property_cache; |
354 | u32 bandwidth = carrier_width(c->symbol_rate, c->rolloff); | 353 | u32 bandwidth = carrier_width(c->symbol_rate, c->rolloff); |
diff --git a/drivers/media/dvb/frontends/tda10021.c b/drivers/media/dvb/frontends/tda10021.c index 2518c5a33225..a1629d1d565b 100644 --- a/drivers/media/dvb/frontends/tda10021.c +++ b/drivers/media/dvb/frontends/tda10021.c | |||
@@ -283,7 +283,7 @@ static int tda10021_set_parameters (struct dvb_frontend *fe, | |||
283 | //printk("tda10021: set frequency to %d qam=%d symrate=%d\n", p->frequency,qam,p->u.qam.symbol_rate); | 283 | //printk("tda10021: set frequency to %d qam=%d symrate=%d\n", p->frequency,qam,p->u.qam.symbol_rate); |
284 | 284 | ||
285 | if (fe->ops.tuner_ops.set_params) { | 285 | if (fe->ops.tuner_ops.set_params) { |
286 | fe->ops.tuner_ops.set_params(fe, p); | 286 | fe->ops.tuner_ops.set_params(fe); |
287 | if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 0); | 287 | if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 0); |
288 | } | 288 | } |
289 | 289 | ||
diff --git a/drivers/media/dvb/frontends/tda10023.c b/drivers/media/dvb/frontends/tda10023.c index af7f1b808a34..ecc4b5592a17 100644 --- a/drivers/media/dvb/frontends/tda10023.c +++ b/drivers/media/dvb/frontends/tda10023.c | |||
@@ -351,7 +351,7 @@ static int tda10023_set_parameters (struct dvb_frontend *fe, | |||
351 | } | 351 | } |
352 | 352 | ||
353 | if (fe->ops.tuner_ops.set_params) { | 353 | if (fe->ops.tuner_ops.set_params) { |
354 | fe->ops.tuner_ops.set_params(fe, p); | 354 | fe->ops.tuner_ops.set_params(fe); |
355 | if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 0); | 355 | if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 0); |
356 | } | 356 | } |
357 | 357 | ||
diff --git a/drivers/media/dvb/frontends/tda10048.c b/drivers/media/dvb/frontends/tda10048.c index 7f105946a434..d450385d91cc 100644 --- a/drivers/media/dvb/frontends/tda10048.c +++ b/drivers/media/dvb/frontends/tda10048.c | |||
@@ -756,7 +756,7 @@ static int tda10048_set_frontend(struct dvb_frontend *fe, | |||
756 | if (fe->ops.i2c_gate_ctrl) | 756 | if (fe->ops.i2c_gate_ctrl) |
757 | fe->ops.i2c_gate_ctrl(fe, 1); | 757 | fe->ops.i2c_gate_ctrl(fe, 1); |
758 | 758 | ||
759 | fe->ops.tuner_ops.set_params(fe, p); | 759 | fe->ops.tuner_ops.set_params(fe); |
760 | 760 | ||
761 | if (fe->ops.i2c_gate_ctrl) | 761 | if (fe->ops.i2c_gate_ctrl) |
762 | fe->ops.i2c_gate_ctrl(fe, 0); | 762 | fe->ops.i2c_gate_ctrl(fe, 0); |
diff --git a/drivers/media/dvb/frontends/tda1004x.c b/drivers/media/dvb/frontends/tda1004x.c index ea485d923550..dbac35bbca57 100644 --- a/drivers/media/dvb/frontends/tda1004x.c +++ b/drivers/media/dvb/frontends/tda1004x.c | |||
@@ -718,7 +718,7 @@ static int tda1004x_set_fe(struct dvb_frontend* fe, | |||
718 | 718 | ||
719 | // set frequency | 719 | // set frequency |
720 | if (fe->ops.tuner_ops.set_params) { | 720 | if (fe->ops.tuner_ops.set_params) { |
721 | fe->ops.tuner_ops.set_params(fe, fe_params); | 721 | fe->ops.tuner_ops.set_params(fe); |
722 | if (fe->ops.i2c_gate_ctrl) | 722 | if (fe->ops.i2c_gate_ctrl) |
723 | fe->ops.i2c_gate_ctrl(fe, 0); | 723 | fe->ops.i2c_gate_ctrl(fe, 0); |
724 | } | 724 | } |
diff --git a/drivers/media/dvb/frontends/tda10086.c b/drivers/media/dvb/frontends/tda10086.c index f2c8faac6f36..7656ff7b41aa 100644 --- a/drivers/media/dvb/frontends/tda10086.c +++ b/drivers/media/dvb/frontends/tda10086.c | |||
@@ -425,7 +425,7 @@ static int tda10086_set_frontend(struct dvb_frontend* fe, | |||
425 | 425 | ||
426 | /* set params */ | 426 | /* set params */ |
427 | if (fe->ops.tuner_ops.set_params) { | 427 | if (fe->ops.tuner_ops.set_params) { |
428 | fe->ops.tuner_ops.set_params(fe, fe_params); | 428 | fe->ops.tuner_ops.set_params(fe); |
429 | if (fe->ops.i2c_gate_ctrl) | 429 | if (fe->ops.i2c_gate_ctrl) |
430 | fe->ops.i2c_gate_ctrl(fe, 0); | 430 | fe->ops.i2c_gate_ctrl(fe, 0); |
431 | 431 | ||
diff --git a/drivers/media/dvb/frontends/tda18271c2dd.c b/drivers/media/dvb/frontends/tda18271c2dd.c index f8933cf66ebb..86da3d816498 100644 --- a/drivers/media/dvb/frontends/tda18271c2dd.c +++ b/drivers/media/dvb/frontends/tda18271c2dd.c | |||
@@ -1124,8 +1124,7 @@ static int release(struct dvb_frontend *fe) | |||
1124 | } | 1124 | } |
1125 | 1125 | ||
1126 | 1126 | ||
1127 | static int set_params(struct dvb_frontend *fe, | 1127 | static int set_params(struct dvb_frontend *fe) |
1128 | struct dvb_frontend_parameters *params) | ||
1129 | { | 1128 | { |
1130 | struct tda_state *state = fe->tuner_priv; | 1129 | struct tda_state *state = fe->tuner_priv; |
1131 | int status = 0; | 1130 | int status = 0; |
diff --git a/drivers/media/dvb/frontends/tda8083.c b/drivers/media/dvb/frontends/tda8083.c index 9369f7442f27..3f2b1b8eb00b 100644 --- a/drivers/media/dvb/frontends/tda8083.c +++ b/drivers/media/dvb/frontends/tda8083.c | |||
@@ -320,7 +320,7 @@ static int tda8083_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_par | |||
320 | struct tda8083_state* state = fe->demodulator_priv; | 320 | struct tda8083_state* state = fe->demodulator_priv; |
321 | 321 | ||
322 | if (fe->ops.tuner_ops.set_params) { | 322 | if (fe->ops.tuner_ops.set_params) { |
323 | fe->ops.tuner_ops.set_params(fe, p); | 323 | fe->ops.tuner_ops.set_params(fe); |
324 | if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 0); | 324 | if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 0); |
325 | } | 325 | } |
326 | 326 | ||
diff --git a/drivers/media/dvb/frontends/tda826x.c b/drivers/media/dvb/frontends/tda826x.c index ab9122a237f5..04bbcc24de0a 100644 --- a/drivers/media/dvb/frontends/tda826x.c +++ b/drivers/media/dvb/frontends/tda826x.c | |||
@@ -71,7 +71,7 @@ static int tda826x_sleep(struct dvb_frontend *fe) | |||
71 | return (ret == 1) ? 0 : ret; | 71 | return (ret == 1) ? 0 : ret; |
72 | } | 72 | } |
73 | 73 | ||
74 | static int tda826x_set_params(struct dvb_frontend *fe, struct dvb_frontend_parameters *params) | 74 | static int tda826x_set_params(struct dvb_frontend *fe) |
75 | { | 75 | { |
76 | struct dtv_frontend_properties *p = &fe->dtv_property_cache; | 76 | struct dtv_frontend_properties *p = &fe->dtv_property_cache; |
77 | struct tda826x_priv *priv = fe->tuner_priv; | 77 | struct tda826x_priv *priv = fe->tuner_priv; |
diff --git a/drivers/media/dvb/frontends/tdhd1.h b/drivers/media/dvb/frontends/tdhd1.h index 9db221bf35ad..17750985db0c 100644 --- a/drivers/media/dvb/frontends/tdhd1.h +++ b/drivers/media/dvb/frontends/tdhd1.h | |||
@@ -40,7 +40,7 @@ static struct tda1004x_config alps_tdhd1_204a_config = { | |||
40 | .request_firmware = alps_tdhd1_204_request_firmware | 40 | .request_firmware = alps_tdhd1_204_request_firmware |
41 | }; | 41 | }; |
42 | 42 | ||
43 | static int alps_tdhd1_204a_tuner_set_params(struct dvb_frontend *fe, struct dvb_frontend_parameters *params) | 43 | static int alps_tdhd1_204a_tuner_set_params(struct dvb_frontend *fe) |
44 | { | 44 | { |
45 | struct dtv_frontend_properties *p = &fe->dtv_property_cache; | 45 | struct dtv_frontend_properties *p = &fe->dtv_property_cache; |
46 | struct i2c_adapter *i2c = fe->tuner_priv; | 46 | struct i2c_adapter *i2c = fe->tuner_priv; |
diff --git a/drivers/media/dvb/frontends/tua6100.c b/drivers/media/dvb/frontends/tua6100.c index 7842e620e6b3..029384d1fddd 100644 --- a/drivers/media/dvb/frontends/tua6100.c +++ b/drivers/media/dvb/frontends/tua6100.c | |||
@@ -67,8 +67,7 @@ static int tua6100_sleep(struct dvb_frontend *fe) | |||
67 | return (ret == 1) ? 0 : ret; | 67 | return (ret == 1) ? 0 : ret; |
68 | } | 68 | } |
69 | 69 | ||
70 | static int tua6100_set_params(struct dvb_frontend *fe, | 70 | static int tua6100_set_params(struct dvb_frontend *fe) |
71 | struct dvb_frontend_parameters *params) | ||
72 | { | 71 | { |
73 | struct dtv_frontend_properties *c = &fe->dtv_property_cache; | 72 | struct dtv_frontend_properties *c = &fe->dtv_property_cache; |
74 | struct tua6100_priv *priv = fe->tuner_priv; | 73 | struct tua6100_priv *priv = fe->tuner_priv; |
diff --git a/drivers/media/dvb/frontends/ves1820.c b/drivers/media/dvb/frontends/ves1820.c index 550a07a8a997..270c7f93008b 100644 --- a/drivers/media/dvb/frontends/ves1820.c +++ b/drivers/media/dvb/frontends/ves1820.c | |||
@@ -219,7 +219,7 @@ static int ves1820_set_parameters(struct dvb_frontend* fe, struct dvb_frontend_p | |||
219 | return -EINVAL; | 219 | return -EINVAL; |
220 | 220 | ||
221 | if (fe->ops.tuner_ops.set_params) { | 221 | if (fe->ops.tuner_ops.set_params) { |
222 | fe->ops.tuner_ops.set_params(fe, p); | 222 | fe->ops.tuner_ops.set_params(fe); |
223 | if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 0); | 223 | if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 0); |
224 | } | 224 | } |
225 | 225 | ||
diff --git a/drivers/media/dvb/frontends/ves1x93.c b/drivers/media/dvb/frontends/ves1x93.c index 8d7854c2fb0c..5ffbf5e89a65 100644 --- a/drivers/media/dvb/frontends/ves1x93.c +++ b/drivers/media/dvb/frontends/ves1x93.c | |||
@@ -389,7 +389,7 @@ static int ves1x93_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_par | |||
389 | struct ves1x93_state* state = fe->demodulator_priv; | 389 | struct ves1x93_state* state = fe->demodulator_priv; |
390 | 390 | ||
391 | if (fe->ops.tuner_ops.set_params) { | 391 | if (fe->ops.tuner_ops.set_params) { |
392 | fe->ops.tuner_ops.set_params(fe, p); | 392 | fe->ops.tuner_ops.set_params(fe); |
393 | if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 0); | 393 | if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 0); |
394 | } | 394 | } |
395 | ves1x93_set_inversion (state, p->inversion); | 395 | ves1x93_set_inversion (state, p->inversion); |
diff --git a/drivers/media/dvb/frontends/zl10036.c b/drivers/media/dvb/frontends/zl10036.c index 129d0f2a87e4..0903d461b8fa 100644 --- a/drivers/media/dvb/frontends/zl10036.c +++ b/drivers/media/dvb/frontends/zl10036.c | |||
@@ -305,8 +305,7 @@ static int zl10036_set_gain_params(struct zl10036_state *state, | |||
305 | return zl10036_write(state, buf, sizeof(buf)); | 305 | return zl10036_write(state, buf, sizeof(buf)); |
306 | } | 306 | } |
307 | 307 | ||
308 | static int zl10036_set_params(struct dvb_frontend *fe, | 308 | static int zl10036_set_params(struct dvb_frontend *fe) |
309 | struct dvb_frontend_parameters *params) | ||
310 | { | 309 | { |
311 | struct dtv_frontend_properties *p = &fe->dtv_property_cache; | 310 | struct dtv_frontend_properties *p = &fe->dtv_property_cache; |
312 | struct zl10036_state *state = fe->tuner_priv; | 311 | struct zl10036_state *state = fe->tuner_priv; |
diff --git a/drivers/media/dvb/frontends/zl10039.c b/drivers/media/dvb/frontends/zl10039.c index 7fc8cef408b7..eff9c5fde50a 100644 --- a/drivers/media/dvb/frontends/zl10039.c +++ b/drivers/media/dvb/frontends/zl10039.c | |||
@@ -176,8 +176,7 @@ static int zl10039_sleep(struct dvb_frontend *fe) | |||
176 | return 0; | 176 | return 0; |
177 | } | 177 | } |
178 | 178 | ||
179 | static int zl10039_set_params(struct dvb_frontend *fe, | 179 | static int zl10039_set_params(struct dvb_frontend *fe) |
180 | struct dvb_frontend_parameters *params) | ||
181 | { | 180 | { |
182 | struct dtv_frontend_properties *c = &fe->dtv_property_cache; | 181 | struct dtv_frontend_properties *c = &fe->dtv_property_cache; |
183 | struct zl10039_state *state = fe->tuner_priv; | 182 | struct zl10039_state *state = fe->tuner_priv; |
diff --git a/drivers/media/dvb/frontends/zl10353.c b/drivers/media/dvb/frontends/zl10353.c index 9caccc03d588..0945aa0f9294 100644 --- a/drivers/media/dvb/frontends/zl10353.c +++ b/drivers/media/dvb/frontends/zl10353.c | |||
@@ -362,7 +362,7 @@ static int zl10353_set_parameters(struct dvb_frontend *fe, | |||
362 | */ | 362 | */ |
363 | if (state->config.no_tuner) { | 363 | if (state->config.no_tuner) { |
364 | if (fe->ops.tuner_ops.set_params) { | 364 | if (fe->ops.tuner_ops.set_params) { |
365 | fe->ops.tuner_ops.set_params(fe, param); | 365 | fe->ops.tuner_ops.set_params(fe); |
366 | if (fe->ops.i2c_gate_ctrl) | 366 | if (fe->ops.i2c_gate_ctrl) |
367 | fe->ops.i2c_gate_ctrl(fe, 0); | 367 | fe->ops.i2c_gate_ctrl(fe, 0); |
368 | } | 368 | } |
diff --git a/drivers/media/dvb/mantis/mantis_vp1033.c b/drivers/media/dvb/mantis/mantis_vp1033.c index dfaca2ab4803..ad013e93ed11 100644 --- a/drivers/media/dvb/mantis/mantis_vp1033.c +++ b/drivers/media/dvb/mantis/mantis_vp1033.c | |||
@@ -83,8 +83,7 @@ u8 lgtdqcs001f_inittab[] = { | |||
83 | #define MANTIS_MODEL_NAME "VP-1033" | 83 | #define MANTIS_MODEL_NAME "VP-1033" |
84 | #define MANTIS_DEV_TYPE "DVB-S/DSS" | 84 | #define MANTIS_DEV_TYPE "DVB-S/DSS" |
85 | 85 | ||
86 | int lgtdqcs001f_tuner_set(struct dvb_frontend *fe, | 86 | int lgtdqcs001f_tuner_set(struct dvb_frontend *fe) |
87 | struct dvb_frontend_parameters *params) | ||
88 | { | 87 | { |
89 | struct dtv_frontend_properties *p = &fe->dtv_property_cache; | 88 | struct dtv_frontend_properties *p = &fe->dtv_property_cache; |
90 | struct mantis_pci *mantis = fe->dvb->priv; | 89 | struct mantis_pci *mantis = fe->dvb->priv; |
diff --git a/drivers/media/dvb/mantis/mantis_vp2033.c b/drivers/media/dvb/mantis/mantis_vp2033.c index f58ce608076c..1ca6837fbe46 100644 --- a/drivers/media/dvb/mantis/mantis_vp2033.c +++ b/drivers/media/dvb/mantis/mantis_vp2033.c | |||
@@ -65,7 +65,7 @@ static u8 read_pwm(struct mantis_pci *mantis) | |||
65 | return pwm; | 65 | return pwm; |
66 | } | 66 | } |
67 | 67 | ||
68 | static int tda1002x_cu1216_tuner_set(struct dvb_frontend *fe, struct dvb_frontend_parameters *params) | 68 | static int tda1002x_cu1216_tuner_set(struct dvb_frontend *fe) |
69 | { | 69 | { |
70 | struct dtv_frontend_properties *p = &fe->dtv_property_cache; | 70 | struct dtv_frontend_properties *p = &fe->dtv_property_cache; |
71 | struct mantis_pci *mantis = fe->dvb->priv; | 71 | struct mantis_pci *mantis = fe->dvb->priv; |
diff --git a/drivers/media/dvb/mantis/mantis_vp2040.c b/drivers/media/dvb/mantis/mantis_vp2040.c index beadfea4f0c8..d480741afd78 100644 --- a/drivers/media/dvb/mantis/mantis_vp2040.c +++ b/drivers/media/dvb/mantis/mantis_vp2040.c | |||
@@ -47,7 +47,7 @@ struct tda10023_config vp2040_tda10023_cu1216_config = { | |||
47 | .invert = 1, | 47 | .invert = 1, |
48 | }; | 48 | }; |
49 | 49 | ||
50 | static int tda1002x_cu1216_tuner_set(struct dvb_frontend *fe, struct dvb_frontend_parameters *params) | 50 | static int tda1002x_cu1216_tuner_set(struct dvb_frontend *fe) |
51 | { | 51 | { |
52 | struct dtv_frontend_properties *p = &fe->dtv_property_cache; | 52 | struct dtv_frontend_properties *p = &fe->dtv_property_cache; |
53 | struct mantis_pci *mantis = fe->dvb->priv; | 53 | struct mantis_pci *mantis = fe->dvb->priv; |
diff --git a/drivers/media/dvb/pluto2/pluto2.c b/drivers/media/dvb/pluto2/pluto2.c index 027da577c407..e1f20c236989 100644 --- a/drivers/media/dvb/pluto2/pluto2.c +++ b/drivers/media/dvb/pluto2/pluto2.c | |||
@@ -445,8 +445,7 @@ static inline u32 divide(u32 numerator, u32 denominator) | |||
445 | } | 445 | } |
446 | 446 | ||
447 | /* LG Innotek TDTE-E001P (Infineon TUA6034) */ | 447 | /* LG Innotek TDTE-E001P (Infineon TUA6034) */ |
448 | static int lg_tdtpe001p_tuner_set_params(struct dvb_frontend *fe, | 448 | static int lg_tdtpe001p_tuner_set_params(struct dvb_frontend *fe) |
449 | struct dvb_frontend_parameters *foo) | ||
450 | { | 449 | { |
451 | struct dtv_frontend_properties *p = &fe->dtv_property_cache; | 450 | struct dtv_frontend_properties *p = &fe->dtv_property_cache; |
452 | struct pluto *pluto = frontend_to_pluto(fe); | 451 | struct pluto *pluto = frontend_to_pluto(fe); |
diff --git a/drivers/media/dvb/ttpci/av7110.c b/drivers/media/dvb/ttpci/av7110.c index c6191e1f162b..94b13ae1b2fb 100644 --- a/drivers/media/dvb/ttpci/av7110.c +++ b/drivers/media/dvb/ttpci/av7110.c | |||
@@ -1568,7 +1568,7 @@ static int get_firmware(struct av7110* av7110) | |||
1568 | return ret; | 1568 | return ret; |
1569 | } | 1569 | } |
1570 | 1570 | ||
1571 | static int alps_bsrv2_tuner_set_params(struct dvb_frontend* fe, struct dvb_frontend_parameters *params) | 1571 | static int alps_bsrv2_tuner_set_params(struct dvb_frontend *fe) |
1572 | { | 1572 | { |
1573 | struct dtv_frontend_properties *p = &fe->dtv_property_cache; | 1573 | struct dtv_frontend_properties *p = &fe->dtv_property_cache; |
1574 | struct av7110* av7110 = fe->dvb->priv; | 1574 | struct av7110* av7110 = fe->dvb->priv; |
@@ -1611,7 +1611,7 @@ static struct ves1x93_config alps_bsrv2_config = { | |||
1611 | .invert_pwm = 0, | 1611 | .invert_pwm = 0, |
1612 | }; | 1612 | }; |
1613 | 1613 | ||
1614 | static int alps_tdbe2_tuner_set_params(struct dvb_frontend* fe, struct dvb_frontend_parameters *params) | 1614 | static int alps_tdbe2_tuner_set_params(struct dvb_frontend *fe) |
1615 | { | 1615 | { |
1616 | struct dtv_frontend_properties *p = &fe->dtv_property_cache; | 1616 | struct dtv_frontend_properties *p = &fe->dtv_property_cache; |
1617 | struct av7110* av7110 = fe->dvb->priv; | 1617 | struct av7110* av7110 = fe->dvb->priv; |
@@ -1643,7 +1643,7 @@ static struct ves1820_config alps_tdbe2_config = { | |||
1643 | 1643 | ||
1644 | 1644 | ||
1645 | 1645 | ||
1646 | static int grundig_29504_451_tuner_set_params(struct dvb_frontend* fe, struct dvb_frontend_parameters *params) | 1646 | static int grundig_29504_451_tuner_set_params(struct dvb_frontend *fe) |
1647 | { | 1647 | { |
1648 | struct dtv_frontend_properties *p = &fe->dtv_property_cache; | 1648 | struct dtv_frontend_properties *p = &fe->dtv_property_cache; |
1649 | struct av7110* av7110 = fe->dvb->priv; | 1649 | struct av7110* av7110 = fe->dvb->priv; |
@@ -1670,7 +1670,7 @@ static struct tda8083_config grundig_29504_451_config = { | |||
1670 | 1670 | ||
1671 | 1671 | ||
1672 | 1672 | ||
1673 | static int philips_cd1516_tuner_set_params(struct dvb_frontend* fe, struct dvb_frontend_parameters *params) | 1673 | static int philips_cd1516_tuner_set_params(struct dvb_frontend *fe) |
1674 | { | 1674 | { |
1675 | struct dtv_frontend_properties *p = &fe->dtv_property_cache; | 1675 | struct dtv_frontend_properties *p = &fe->dtv_property_cache; |
1676 | struct av7110* av7110 = fe->dvb->priv; | 1676 | struct av7110* av7110 = fe->dvb->priv; |
@@ -1702,7 +1702,7 @@ static struct ves1820_config philips_cd1516_config = { | |||
1702 | 1702 | ||
1703 | 1703 | ||
1704 | 1704 | ||
1705 | static int alps_tdlb7_tuner_set_params(struct dvb_frontend* fe, struct dvb_frontend_parameters *params) | 1705 | static int alps_tdlb7_tuner_set_params(struct dvb_frontend *fe) |
1706 | { | 1706 | { |
1707 | struct dtv_frontend_properties *p = &fe->dtv_property_cache; | 1707 | struct dtv_frontend_properties *p = &fe->dtv_property_cache; |
1708 | struct av7110* av7110 = fe->dvb->priv; | 1708 | struct av7110* av7110 = fe->dvb->priv; |
@@ -1840,7 +1840,7 @@ static u8 nexusca_stv0297_inittab[] = { | |||
1840 | 0xff, 0xff, | 1840 | 0xff, 0xff, |
1841 | }; | 1841 | }; |
1842 | 1842 | ||
1843 | static int nexusca_stv0297_tuner_set_params(struct dvb_frontend* fe, struct dvb_frontend_parameters *params) | 1843 | static int nexusca_stv0297_tuner_set_params(struct dvb_frontend *fe) |
1844 | { | 1844 | { |
1845 | struct dtv_frontend_properties *p = &fe->dtv_property_cache; | 1845 | struct dtv_frontend_properties *p = &fe->dtv_property_cache; |
1846 | struct av7110* av7110 = fe->dvb->priv; | 1846 | struct av7110* av7110 = fe->dvb->priv; |
@@ -1896,7 +1896,7 @@ static struct stv0297_config nexusca_stv0297_config = { | |||
1896 | 1896 | ||
1897 | 1897 | ||
1898 | 1898 | ||
1899 | static int grundig_29504_401_tuner_set_params(struct dvb_frontend* fe, struct dvb_frontend_parameters *params) | 1899 | static int grundig_29504_401_tuner_set_params(struct dvb_frontend *fe) |
1900 | { | 1900 | { |
1901 | struct dtv_frontend_properties *p = &fe->dtv_property_cache; | 1901 | struct dtv_frontend_properties *p = &fe->dtv_property_cache; |
1902 | struct av7110* av7110 = fe->dvb->priv; | 1902 | struct av7110* av7110 = fe->dvb->priv; |
diff --git a/drivers/media/dvb/ttpci/budget-av.c b/drivers/media/dvb/ttpci/budget-av.c index a40ea6e1c0d1..8b32e282bf5d 100644 --- a/drivers/media/dvb/ttpci/budget-av.c +++ b/drivers/media/dvb/ttpci/budget-av.c | |||
@@ -502,8 +502,7 @@ static int philips_su1278_ty_ci_set_symbol_rate(struct dvb_frontend *fe, u32 sra | |||
502 | return 0; | 502 | return 0; |
503 | } | 503 | } |
504 | 504 | ||
505 | static int philips_su1278_ty_ci_tuner_set_params(struct dvb_frontend *fe, | 505 | static int philips_su1278_ty_ci_tuner_set_params(struct dvb_frontend *fe) |
506 | struct dvb_frontend_parameters *params) | ||
507 | { | 506 | { |
508 | struct dtv_frontend_properties *c = &fe->dtv_property_cache; | 507 | struct dtv_frontend_properties *c = &fe->dtv_property_cache; |
509 | u32 div; | 508 | u32 div; |
@@ -618,7 +617,7 @@ static struct stv0299_config cinergy_1200s_1894_0010_config = { | |||
618 | .set_symbol_rate = philips_su1278_ty_ci_set_symbol_rate, | 617 | .set_symbol_rate = philips_su1278_ty_ci_set_symbol_rate, |
619 | }; | 618 | }; |
620 | 619 | ||
621 | static int philips_cu1216_tuner_set_params(struct dvb_frontend *fe, struct dvb_frontend_parameters *params) | 620 | static int philips_cu1216_tuner_set_params(struct dvb_frontend *fe) |
622 | { | 621 | { |
623 | struct dtv_frontend_properties *c = &fe->dtv_property_cache; | 622 | struct dtv_frontend_properties *c = &fe->dtv_property_cache; |
624 | struct budget *budget = (struct budget *) fe->dvb->priv; | 623 | struct budget *budget = (struct budget *) fe->dvb->priv; |
@@ -699,7 +698,7 @@ static int philips_tu1216_tuner_init(struct dvb_frontend *fe) | |||
699 | return 0; | 698 | return 0; |
700 | } | 699 | } |
701 | 700 | ||
702 | static int philips_tu1216_tuner_set_params(struct dvb_frontend *fe, struct dvb_frontend_parameters *params) | 701 | static int philips_tu1216_tuner_set_params(struct dvb_frontend *fe) |
703 | { | 702 | { |
704 | struct dtv_frontend_properties *c = &fe->dtv_property_cache; | 703 | struct dtv_frontend_properties *c = &fe->dtv_property_cache; |
705 | struct budget *budget = (struct budget *) fe->dvb->priv; | 704 | struct budget *budget = (struct budget *) fe->dvb->priv; |
diff --git a/drivers/media/dvb/ttpci/budget-ci.c b/drivers/media/dvb/ttpci/budget-ci.c index bf8b4934cb7c..98e524178765 100644 --- a/drivers/media/dvb/ttpci/budget-ci.c +++ b/drivers/media/dvb/ttpci/budget-ci.c | |||
@@ -660,8 +660,7 @@ static int philips_su1278_tt_set_symbol_rate(struct dvb_frontend *fe, u32 srate, | |||
660 | return 0; | 660 | return 0; |
661 | } | 661 | } |
662 | 662 | ||
663 | static int philips_su1278_tt_tuner_set_params(struct dvb_frontend *fe, | 663 | static int philips_su1278_tt_tuner_set_params(struct dvb_frontend *fe) |
664 | struct dvb_frontend_parameters *params) | ||
665 | { | 664 | { |
666 | struct dtv_frontend_properties *p = &fe->dtv_property_cache; | 665 | struct dtv_frontend_properties *p = &fe->dtv_property_cache; |
667 | struct budget_ci *budget_ci = (struct budget_ci *) fe->dvb->priv; | 666 | struct budget_ci *budget_ci = (struct budget_ci *) fe->dvb->priv; |
@@ -742,7 +741,7 @@ static int philips_tdm1316l_tuner_init(struct dvb_frontend *fe) | |||
742 | return 0; | 741 | return 0; |
743 | } | 742 | } |
744 | 743 | ||
745 | static int philips_tdm1316l_tuner_set_params(struct dvb_frontend *fe, struct dvb_frontend_parameters *params) | 744 | static int philips_tdm1316l_tuner_set_params(struct dvb_frontend *fe) |
746 | { | 745 | { |
747 | struct dtv_frontend_properties *p = &fe->dtv_property_cache; | 746 | struct dtv_frontend_properties *p = &fe->dtv_property_cache; |
748 | struct budget_ci *budget_ci = (struct budget_ci *) fe->dvb->priv; | 747 | struct budget_ci *budget_ci = (struct budget_ci *) fe->dvb->priv; |
@@ -858,7 +857,7 @@ static struct tda1004x_config philips_tdm1316l_config_invert = { | |||
858 | .request_firmware = philips_tdm1316l_request_firmware, | 857 | .request_firmware = philips_tdm1316l_request_firmware, |
859 | }; | 858 | }; |
860 | 859 | ||
861 | static int dvbc_philips_tdm1316l_tuner_set_params(struct dvb_frontend *fe, struct dvb_frontend_parameters *params) | 860 | static int dvbc_philips_tdm1316l_tuner_set_params(struct dvb_frontend *fe) |
862 | { | 861 | { |
863 | struct dtv_frontend_properties *p = &fe->dtv_property_cache; | 862 | struct dtv_frontend_properties *p = &fe->dtv_property_cache; |
864 | struct budget_ci *budget_ci = (struct budget_ci *) fe->dvb->priv; | 863 | struct budget_ci *budget_ci = (struct budget_ci *) fe->dvb->priv; |
diff --git a/drivers/media/dvb/ttpci/budget-patch.c b/drivers/media/dvb/ttpci/budget-patch.c index 4485cccf004e..2cb35c23d2ac 100644 --- a/drivers/media/dvb/ttpci/budget-patch.c +++ b/drivers/media/dvb/ttpci/budget-patch.c | |||
@@ -261,7 +261,7 @@ static int budget_patch_diseqc_send_burst(struct dvb_frontend* fe, fe_sec_mini_c | |||
261 | return 0; | 261 | return 0; |
262 | } | 262 | } |
263 | 263 | ||
264 | static int alps_bsrv2_tuner_set_params(struct dvb_frontend* fe, struct dvb_frontend_parameters* params) | 264 | static int alps_bsrv2_tuner_set_params(struct dvb_frontend *fe) |
265 | { | 265 | { |
266 | struct dtv_frontend_properties *p = &fe->dtv_property_cache; | 266 | struct dtv_frontend_properties *p = &fe->dtv_property_cache; |
267 | struct budget_patch* budget = (struct budget_patch*) fe->dvb->priv; | 267 | struct budget_patch* budget = (struct budget_patch*) fe->dvb->priv; |
@@ -303,7 +303,7 @@ static struct ves1x93_config alps_bsrv2_config = { | |||
303 | .invert_pwm = 0, | 303 | .invert_pwm = 0, |
304 | }; | 304 | }; |
305 | 305 | ||
306 | static int grundig_29504_451_tuner_set_params(struct dvb_frontend* fe, struct dvb_frontend_parameters* params) | 306 | static int grundig_29504_451_tuner_set_params(struct dvb_frontend *fe) |
307 | { | 307 | { |
308 | struct dtv_frontend_properties *p = &fe->dtv_property_cache; | 308 | struct dtv_frontend_properties *p = &fe->dtv_property_cache; |
309 | struct budget_patch* budget = (struct budget_patch*) fe->dvb->priv; | 309 | struct budget_patch* budget = (struct budget_patch*) fe->dvb->priv; |
diff --git a/drivers/media/dvb/ttpci/budget.c b/drivers/media/dvb/ttpci/budget.c index ff41eee75102..b21bcce66708 100644 --- a/drivers/media/dvb/ttpci/budget.c +++ b/drivers/media/dvb/ttpci/budget.c | |||
@@ -200,7 +200,7 @@ static int budget_diseqc_send_burst(struct dvb_frontend* fe, fe_sec_mini_cmd_t m | |||
200 | return 0; | 200 | return 0; |
201 | } | 201 | } |
202 | 202 | ||
203 | static int alps_bsrv2_tuner_set_params(struct dvb_frontend* fe, struct dvb_frontend_parameters* params) | 203 | static int alps_bsrv2_tuner_set_params(struct dvb_frontend *fe) |
204 | { | 204 | { |
205 | struct dtv_frontend_properties *c = &fe->dtv_property_cache; | 205 | struct dtv_frontend_properties *c = &fe->dtv_property_cache; |
206 | struct budget* budget = (struct budget*) fe->dvb->priv; | 206 | struct budget* budget = (struct budget*) fe->dvb->priv; |
@@ -242,7 +242,7 @@ static struct ves1x93_config alps_bsrv2_config = | |||
242 | .invert_pwm = 0, | 242 | .invert_pwm = 0, |
243 | }; | 243 | }; |
244 | 244 | ||
245 | static int alps_tdbe2_tuner_set_params(struct dvb_frontend* fe, struct dvb_frontend_parameters* params) | 245 | static int alps_tdbe2_tuner_set_params(struct dvb_frontend *fe) |
246 | { | 246 | { |
247 | struct dtv_frontend_properties *c = &fe->dtv_property_cache; | 247 | struct dtv_frontend_properties *c = &fe->dtv_property_cache; |
248 | struct budget* budget = (struct budget*) fe->dvb->priv; | 248 | struct budget* budget = (struct budget*) fe->dvb->priv; |
@@ -270,7 +270,7 @@ static struct ves1820_config alps_tdbe2_config = { | |||
270 | .selagc = VES1820_SELAGC_SIGNAMPERR, | 270 | .selagc = VES1820_SELAGC_SIGNAMPERR, |
271 | }; | 271 | }; |
272 | 272 | ||
273 | static int grundig_29504_401_tuner_set_params(struct dvb_frontend* fe, struct dvb_frontend_parameters* params) | 273 | static int grundig_29504_401_tuner_set_params(struct dvb_frontend *fe) |
274 | { | 274 | { |
275 | struct dtv_frontend_properties *c = &fe->dtv_property_cache; | 275 | struct dtv_frontend_properties *c = &fe->dtv_property_cache; |
276 | struct budget *budget = fe->dvb->priv; | 276 | struct budget *budget = fe->dvb->priv; |
@@ -328,7 +328,7 @@ static struct l64781_config grundig_29504_401_config_activy = { | |||
328 | 328 | ||
329 | static u8 tuner_address_grundig_29504_401_activy = 0x60; | 329 | static u8 tuner_address_grundig_29504_401_activy = 0x60; |
330 | 330 | ||
331 | static int grundig_29504_451_tuner_set_params(struct dvb_frontend* fe, struct dvb_frontend_parameters* params) | 331 | static int grundig_29504_451_tuner_set_params(struct dvb_frontend *fe) |
332 | { | 332 | { |
333 | struct dtv_frontend_properties *c = &fe->dtv_property_cache; | 333 | struct dtv_frontend_properties *c = &fe->dtv_property_cache; |
334 | struct budget* budget = (struct budget*) fe->dvb->priv; | 334 | struct budget* budget = (struct budget*) fe->dvb->priv; |
@@ -352,7 +352,7 @@ static struct tda8083_config grundig_29504_451_config = { | |||
352 | .demod_address = 0x68, | 352 | .demod_address = 0x68, |
353 | }; | 353 | }; |
354 | 354 | ||
355 | static int s5h1420_tuner_set_params(struct dvb_frontend* fe, struct dvb_frontend_parameters* params) | 355 | static int s5h1420_tuner_set_params(struct dvb_frontend *fe) |
356 | { | 356 | { |
357 | struct dtv_frontend_properties *c = &fe->dtv_property_cache; | 357 | struct dtv_frontend_properties *c = &fe->dtv_property_cache; |
358 | struct budget* budget = (struct budget*) fe->dvb->priv; | 358 | struct budget* budget = (struct budget*) fe->dvb->priv; |
diff --git a/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c b/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c index 2379f387c50c..5f6ac48198f0 100644 --- a/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c +++ b/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c | |||
@@ -1017,7 +1017,7 @@ static u32 functionality(struct i2c_adapter *adapter) | |||
1017 | 1017 | ||
1018 | 1018 | ||
1019 | 1019 | ||
1020 | static int alps_tdmb7_tuner_set_params(struct dvb_frontend* fe, struct dvb_frontend_parameters* params) | 1020 | static int alps_tdmb7_tuner_set_params(struct dvb_frontend *fe) |
1021 | { | 1021 | { |
1022 | struct dtv_frontend_properties *p = &fe->dtv_property_cache; | 1022 | struct dtv_frontend_properties *p = &fe->dtv_property_cache; |
1023 | struct ttusb* ttusb = (struct ttusb*) fe->dvb->priv; | 1023 | struct ttusb* ttusb = (struct ttusb*) fe->dvb->priv; |
@@ -1072,7 +1072,7 @@ static int philips_tdm1316l_tuner_init(struct dvb_frontend* fe) | |||
1072 | return 0; | 1072 | return 0; |
1073 | } | 1073 | } |
1074 | 1074 | ||
1075 | static int philips_tdm1316l_tuner_set_params(struct dvb_frontend* fe, struct dvb_frontend_parameters* params) | 1075 | static int philips_tdm1316l_tuner_set_params(struct dvb_frontend *fe) |
1076 | { | 1076 | { |
1077 | struct dtv_frontend_properties *p = &fe->dtv_property_cache; | 1077 | struct dtv_frontend_properties *p = &fe->dtv_property_cache; |
1078 | struct ttusb* ttusb = (struct ttusb*) fe->dvb->priv; | 1078 | struct ttusb* ttusb = (struct ttusb*) fe->dvb->priv; |
@@ -1279,7 +1279,7 @@ static int alps_stv0299_set_symbol_rate(struct dvb_frontend *fe, u32 srate, u32 | |||
1279 | return 0; | 1279 | return 0; |
1280 | } | 1280 | } |
1281 | 1281 | ||
1282 | static int philips_tsa5059_tuner_set_params(struct dvb_frontend *fe, struct dvb_frontend_parameters *params) | 1282 | static int philips_tsa5059_tuner_set_params(struct dvb_frontend *fe) |
1283 | { | 1283 | { |
1284 | struct dtv_frontend_properties *p = &fe->dtv_property_cache; | 1284 | struct dtv_frontend_properties *p = &fe->dtv_property_cache; |
1285 | struct ttusb* ttusb = (struct ttusb*) fe->dvb->priv; | 1285 | struct ttusb* ttusb = (struct ttusb*) fe->dvb->priv; |
@@ -1323,7 +1323,7 @@ static struct stv0299_config alps_stv0299_config = { | |||
1323 | .set_symbol_rate = alps_stv0299_set_symbol_rate, | 1323 | .set_symbol_rate = alps_stv0299_set_symbol_rate, |
1324 | }; | 1324 | }; |
1325 | 1325 | ||
1326 | static int ttusb_novas_grundig_29504_491_tuner_set_params(struct dvb_frontend *fe, struct dvb_frontend_parameters *params) | 1326 | static int ttusb_novas_grundig_29504_491_tuner_set_params(struct dvb_frontend *fe) |
1327 | { | 1327 | { |
1328 | struct dtv_frontend_properties *p = &fe->dtv_property_cache; | 1328 | struct dtv_frontend_properties *p = &fe->dtv_property_cache; |
1329 | struct ttusb* ttusb = (struct ttusb*) fe->dvb->priv; | 1329 | struct ttusb* ttusb = (struct ttusb*) fe->dvb->priv; |
@@ -1351,7 +1351,7 @@ static struct tda8083_config ttusb_novas_grundig_29504_491_config = { | |||
1351 | .demod_address = 0x68, | 1351 | .demod_address = 0x68, |
1352 | }; | 1352 | }; |
1353 | 1353 | ||
1354 | static int alps_tdbe2_tuner_set_params(struct dvb_frontend* fe, struct dvb_frontend_parameters* params) | 1354 | static int alps_tdbe2_tuner_set_params(struct dvb_frontend *fe) |
1355 | { | 1355 | { |
1356 | struct dtv_frontend_properties *p = &fe->dtv_property_cache; | 1356 | struct dtv_frontend_properties *p = &fe->dtv_property_cache; |
1357 | struct ttusb* ttusb = fe->dvb->priv; | 1357 | struct ttusb* ttusb = fe->dvb->priv; |
@@ -1396,7 +1396,7 @@ static u8 read_pwm(struct ttusb* ttusb) | |||
1396 | } | 1396 | } |
1397 | 1397 | ||
1398 | 1398 | ||
1399 | static int dvbc_philips_tdm1316l_tuner_set_params(struct dvb_frontend *fe, struct dvb_frontend_parameters *params) | 1399 | static int dvbc_philips_tdm1316l_tuner_set_params(struct dvb_frontend *fe) |
1400 | { | 1400 | { |
1401 | struct dtv_frontend_properties *p = &fe->dtv_property_cache; | 1401 | struct dtv_frontend_properties *p = &fe->dtv_property_cache; |
1402 | struct ttusb *ttusb = (struct ttusb *) fe->dvb->priv; | 1402 | struct ttusb *ttusb = (struct ttusb *) fe->dvb->priv; |
diff --git a/drivers/media/video/cx88/cx88-dvb.c b/drivers/media/video/cx88/cx88-dvb.c index f5430772d504..0829a4f65f6e 100644 --- a/drivers/media/video/cx88/cx88-dvb.c +++ b/drivers/media/video/cx88/cx88-dvb.c | |||
@@ -815,8 +815,7 @@ static const u8 samsung_smt_7020_inittab[] = { | |||
815 | }; | 815 | }; |
816 | 816 | ||
817 | 817 | ||
818 | static int samsung_smt_7020_tuner_set_params(struct dvb_frontend *fe, | 818 | static int samsung_smt_7020_tuner_set_params(struct dvb_frontend *fe) |
819 | struct dvb_frontend_parameters *params) | ||
820 | { | 819 | { |
821 | struct dtv_frontend_properties *c = &fe->dtv_property_cache; | 820 | struct dtv_frontend_properties *c = &fe->dtv_property_cache; |
822 | struct cx8802_dev *dev = fe->dvb->priv; | 821 | struct cx8802_dev *dev = fe->dvb->priv; |
diff --git a/drivers/media/video/saa7134/saa7134-dvb.c b/drivers/media/video/saa7134/saa7134-dvb.c index 5fdb8455fe8a..089fa0fb5c94 100644 --- a/drivers/media/video/saa7134/saa7134-dvb.c +++ b/drivers/media/video/saa7134/saa7134-dvb.c | |||
@@ -183,8 +183,7 @@ static int mt352_avermedia_xc3028_init(struct dvb_frontend *fe) | |||
183 | return 0; | 183 | return 0; |
184 | } | 184 | } |
185 | 185 | ||
186 | static int mt352_pinnacle_tuner_set_params(struct dvb_frontend* fe, | 186 | static int mt352_pinnacle_tuner_set_params(struct dvb_frontend *fe) |
187 | struct dvb_frontend_parameters* params) | ||
188 | { | 187 | { |
189 | struct dtv_frontend_properties *c = &fe->dtv_property_cache; | 188 | struct dtv_frontend_properties *c = &fe->dtv_property_cache; |
190 | u8 off[] = { 0x00, 0xf1}; | 189 | u8 off[] = { 0x00, 0xf1}; |
@@ -288,7 +287,7 @@ static int philips_tda1004x_request_firmware(struct dvb_frontend *fe, | |||
288 | * these tuners are tu1216, td1316(a) | 287 | * these tuners are tu1216, td1316(a) |
289 | */ | 288 | */ |
290 | 289 | ||
291 | static int philips_tda6651_pll_set(struct dvb_frontend *fe, struct dvb_frontend_parameters *params) | 290 | static int philips_tda6651_pll_set(struct dvb_frontend *fe) |
292 | { | 291 | { |
293 | struct dtv_frontend_properties *c = &fe->dtv_property_cache; | 292 | struct dtv_frontend_properties *c = &fe->dtv_property_cache; |
294 | struct saa7134_dev *dev = fe->dvb->priv; | 293 | struct saa7134_dev *dev = fe->dvb->priv; |
@@ -438,9 +437,9 @@ static int philips_td1316_tuner_init(struct dvb_frontend *fe) | |||
438 | return 0; | 437 | return 0; |
439 | } | 438 | } |
440 | 439 | ||
441 | static int philips_td1316_tuner_set_params(struct dvb_frontend *fe, struct dvb_frontend_parameters *params) | 440 | static int philips_td1316_tuner_set_params(struct dvb_frontend *fe) |
442 | { | 441 | { |
443 | return philips_tda6651_pll_set(fe, params); | 442 | return philips_tda6651_pll_set(fe); |
444 | } | 443 | } |
445 | 444 | ||
446 | static int philips_td1316_tuner_sleep(struct dvb_frontend *fe) | 445 | static int philips_td1316_tuner_sleep(struct dvb_frontend *fe) |