diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-12-30 09:30:21 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-12-31 07:28:23 -0500 |
commit | 7c61d80a9bcfc3fdec8ffd75756cad6a64678229 (patch) | |
tree | cd62cf4852ba56a7a5f12cc630cae44000393f34 /drivers/media/dvb/frontends | |
parent | ac3852c41b36cb408bea1400892dd6c61c3b225a (diff) |
[media] dvb: don't require a parameter for get_frontend
Just like set_frontend, use the dvb cache properties for get_frontend.
This is more consistent, as both functions are now symetric. Also,
at the places get_frontend is called, it makes sense to update the
cache.
Most of this patch were generated by this small perl script:
while (<>) { $file .= $_; }
if ($file =~ m/\.get_frontend\s*=\s*([\d\w_]+)/) {
my $get = $1;
$file =~ s/($get)(\s*\([^\,\)]+)\,\s*struct\s+dtv_frontend_properties\s*\*\s*([_\d\w]+)\)\s*\{/\1\2)\n{\n\tstruct dtv_frontend_properties *\3 = &fe->dtv_property_cache;/g;
}
print $file;
Of course, the changes at dvb_frontend.[ch] were made by hand,
as well as the changes on a few other places, where get_frontend()
is called internally inside the driver.
On some places, get_frontend() were just a void function. Those
occurrences were removed, as the DVB core handles such cases.
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/dvb/frontends')
45 files changed, 101 insertions, 98 deletions
diff --git a/drivers/media/dvb/frontends/af9013.c b/drivers/media/dvb/frontends/af9013.c index a70358c06230..e6ba3e014cb4 100644 --- a/drivers/media/dvb/frontends/af9013.c +++ b/drivers/media/dvb/frontends/af9013.c | |||
@@ -845,9 +845,9 @@ err: | |||
845 | return ret; | 845 | return ret; |
846 | } | 846 | } |
847 | 847 | ||
848 | static int af9013_get_frontend(struct dvb_frontend *fe, | 848 | static int af9013_get_frontend(struct dvb_frontend *fe) |
849 | struct dtv_frontend_properties *c) | ||
850 | { | 849 | { |
850 | struct dtv_frontend_properties *c = &fe->dtv_property_cache; | ||
851 | struct af9013_state *state = fe->demodulator_priv; | 851 | struct af9013_state *state = fe->demodulator_priv; |
852 | int ret; | 852 | int ret; |
853 | u8 buf[3]; | 853 | u8 buf[3]; |
diff --git a/drivers/media/dvb/frontends/atbm8830.c b/drivers/media/dvb/frontends/atbm8830.c index c4edbbe7e04d..ff86074d3b87 100644 --- a/drivers/media/dvb/frontends/atbm8830.c +++ b/drivers/media/dvb/frontends/atbm8830.c | |||
@@ -297,9 +297,9 @@ static int atbm8830_set_fe(struct dvb_frontend *fe) | |||
297 | return 0; | 297 | return 0; |
298 | } | 298 | } |
299 | 299 | ||
300 | static int atbm8830_get_fe(struct dvb_frontend *fe, | 300 | static int atbm8830_get_fe(struct dvb_frontend *fe) |
301 | struct dtv_frontend_properties *c) | ||
302 | { | 301 | { |
302 | struct dtv_frontend_properties *c = &fe->dtv_property_cache; | ||
303 | dprintk("%s\n", __func__); | 303 | dprintk("%s\n", __func__); |
304 | 304 | ||
305 | /* TODO: get real readings from device */ | 305 | /* TODO: get real readings from device */ |
diff --git a/drivers/media/dvb/frontends/au8522_dig.c b/drivers/media/dvb/frontends/au8522_dig.c index 027d45dc0f03..762cd5e62fae 100644 --- a/drivers/media/dvb/frontends/au8522_dig.c +++ b/drivers/media/dvb/frontends/au8522_dig.c | |||
@@ -911,9 +911,9 @@ static int au8522_read_ber(struct dvb_frontend *fe, u32 *ber) | |||
911 | return au8522_read_ucblocks(fe, ber); | 911 | return au8522_read_ucblocks(fe, ber); |
912 | } | 912 | } |
913 | 913 | ||
914 | static int au8522_get_frontend(struct dvb_frontend *fe, | 914 | static int au8522_get_frontend(struct dvb_frontend *fe) |
915 | struct dtv_frontend_properties *c) | ||
916 | { | 915 | { |
916 | struct dtv_frontend_properties *c = &fe->dtv_property_cache; | ||
917 | struct au8522_state *state = fe->demodulator_priv; | 917 | struct au8522_state *state = fe->demodulator_priv; |
918 | 918 | ||
919 | c->frequency = state->current_frequency; | 919 | c->frequency = state->current_frequency; |
diff --git a/drivers/media/dvb/frontends/cx22700.c b/drivers/media/dvb/frontends/cx22700.c index cc9b98dc6cb3..a5b1521d238d 100644 --- a/drivers/media/dvb/frontends/cx22700.c +++ b/drivers/media/dvb/frontends/cx22700.c | |||
@@ -341,9 +341,9 @@ static int cx22700_set_frontend(struct dvb_frontend *fe) | |||
341 | return 0; | 341 | return 0; |
342 | } | 342 | } |
343 | 343 | ||
344 | static int cx22700_get_frontend(struct dvb_frontend *fe, | 344 | static int cx22700_get_frontend(struct dvb_frontend *fe) |
345 | struct dtv_frontend_properties *c) | ||
346 | { | 345 | { |
346 | struct dtv_frontend_properties *c = &fe->dtv_property_cache; | ||
347 | struct cx22700_state* state = fe->demodulator_priv; | 347 | struct cx22700_state* state = fe->demodulator_priv; |
348 | u8 reg09 = cx22700_readreg (state, 0x09); | 348 | u8 reg09 = cx22700_readreg (state, 0x09); |
349 | 349 | ||
diff --git a/drivers/media/dvb/frontends/cx22702.c b/drivers/media/dvb/frontends/cx22702.c index fc8f621d88a0..a0dcbd6b424a 100644 --- a/drivers/media/dvb/frontends/cx22702.c +++ b/drivers/media/dvb/frontends/cx22702.c | |||
@@ -546,9 +546,9 @@ static int cx22702_read_ucblocks(struct dvb_frontend *fe, u32 *ucblocks) | |||
546 | return 0; | 546 | return 0; |
547 | } | 547 | } |
548 | 548 | ||
549 | static int cx22702_get_frontend(struct dvb_frontend *fe, | 549 | static int cx22702_get_frontend(struct dvb_frontend *fe) |
550 | struct dtv_frontend_properties *c) | ||
551 | { | 550 | { |
551 | struct dtv_frontend_properties *c = &fe->dtv_property_cache; | ||
552 | struct cx22702_state *state = fe->demodulator_priv; | 552 | struct cx22702_state *state = fe->demodulator_priv; |
553 | 553 | ||
554 | u8 reg0C = cx22702_readreg(state, 0x0C); | 554 | u8 reg0C = cx22702_readreg(state, 0x0C); |
diff --git a/drivers/media/dvb/frontends/cx24110.c b/drivers/media/dvb/frontends/cx24110.c index 29a5ceb3aa25..2f07c494e7fe 100644 --- a/drivers/media/dvb/frontends/cx24110.c +++ b/drivers/media/dvb/frontends/cx24110.c | |||
@@ -549,9 +549,9 @@ static int cx24110_set_frontend(struct dvb_frontend *fe) | |||
549 | return 0; | 549 | return 0; |
550 | } | 550 | } |
551 | 551 | ||
552 | static int cx24110_get_frontend(struct dvb_frontend *fe, | 552 | static int cx24110_get_frontend(struct dvb_frontend *fe) |
553 | struct dtv_frontend_properties *p) | ||
554 | { | 553 | { |
554 | struct dtv_frontend_properties *p = &fe->dtv_property_cache; | ||
555 | struct cx24110_state *state = fe->demodulator_priv; | 555 | struct cx24110_state *state = fe->demodulator_priv; |
556 | s32 afc; unsigned sclk; | 556 | s32 afc; unsigned sclk; |
557 | 557 | ||
diff --git a/drivers/media/dvb/frontends/cx24123.c b/drivers/media/dvb/frontends/cx24123.c index faafb1fc6c05..ad5d1a450b09 100644 --- a/drivers/media/dvb/frontends/cx24123.c +++ b/drivers/media/dvb/frontends/cx24123.c | |||
@@ -959,9 +959,9 @@ static int cx24123_set_frontend(struct dvb_frontend *fe) | |||
959 | return 0; | 959 | return 0; |
960 | } | 960 | } |
961 | 961 | ||
962 | static int cx24123_get_frontend(struct dvb_frontend *fe, | 962 | static int cx24123_get_frontend(struct dvb_frontend *fe) |
963 | struct dtv_frontend_properties *p) | ||
964 | { | 963 | { |
964 | struct dtv_frontend_properties *p = &fe->dtv_property_cache; | ||
965 | struct cx24123_state *state = fe->demodulator_priv; | 965 | struct cx24123_state *state = fe->demodulator_priv; |
966 | 966 | ||
967 | dprintk("\n"); | 967 | dprintk("\n"); |
diff --git a/drivers/media/dvb/frontends/cxd2820r_core.c b/drivers/media/dvb/frontends/cxd2820r_core.c index 0f33dfab2ef1..07c1a956b771 100644 --- a/drivers/media/dvb/frontends/cxd2820r_core.c +++ b/drivers/media/dvb/frontends/cxd2820r_core.c | |||
@@ -307,8 +307,7 @@ static int cxd2820r_read_status(struct dvb_frontend *fe, fe_status_t *status) | |||
307 | return ret; | 307 | return ret; |
308 | } | 308 | } |
309 | 309 | ||
310 | static int cxd2820r_get_frontend(struct dvb_frontend *fe, | 310 | static int cxd2820r_get_frontend(struct dvb_frontend *fe) |
311 | struct dtv_frontend_properties *c) | ||
312 | { | 311 | { |
313 | int ret; | 312 | int ret; |
314 | 313 | ||
diff --git a/drivers/media/dvb/frontends/dib3000mb.c b/drivers/media/dvb/frontends/dib3000mb.c index de9ed6cf1422..a1c5bdbab690 100644 --- a/drivers/media/dvb/frontends/dib3000mb.c +++ b/drivers/media/dvb/frontends/dib3000mb.c | |||
@@ -112,8 +112,7 @@ static u16 dib3000_seq[2][2][2] = /* fft,gua, inv */ | |||
112 | } | 112 | } |
113 | }; | 113 | }; |
114 | 114 | ||
115 | static int dib3000mb_get_frontend(struct dvb_frontend* fe, | 115 | static int dib3000mb_get_frontend(struct dvb_frontend* fe); |
116 | struct dtv_frontend_properties *c); | ||
117 | 116 | ||
118 | static int dib3000mb_set_frontend(struct dvb_frontend *fe, int tuner) | 117 | static int dib3000mb_set_frontend(struct dvb_frontend *fe, int tuner) |
119 | { | 118 | { |
@@ -360,7 +359,7 @@ static int dib3000mb_set_frontend(struct dvb_frontend *fe, int tuner) | |||
360 | deb_setf("search_state after autosearch %d after %d checks\n",search_state,as_count); | 359 | deb_setf("search_state after autosearch %d after %d checks\n",search_state,as_count); |
361 | 360 | ||
362 | if (search_state == 1) { | 361 | if (search_state == 1) { |
363 | if (dib3000mb_get_frontend(fe, c) == 0) { | 362 | if (dib3000mb_get_frontend(fe) == 0) { |
364 | deb_setf("reading tuning data from frontend succeeded.\n"); | 363 | deb_setf("reading tuning data from frontend succeeded.\n"); |
365 | return dib3000mb_set_frontend(fe, 0); | 364 | return dib3000mb_set_frontend(fe, 0); |
366 | } | 365 | } |
@@ -451,9 +450,9 @@ static int dib3000mb_fe_init(struct dvb_frontend* fe, int mobile_mode) | |||
451 | return 0; | 450 | return 0; |
452 | } | 451 | } |
453 | 452 | ||
454 | static int dib3000mb_get_frontend(struct dvb_frontend* fe, | 453 | static int dib3000mb_get_frontend(struct dvb_frontend* fe) |
455 | struct dtv_frontend_properties *c) | ||
456 | { | 454 | { |
455 | struct dtv_frontend_properties *c = &fe->dtv_property_cache; | ||
457 | struct dib3000_state* state = fe->demodulator_priv; | 456 | struct dib3000_state* state = fe->demodulator_priv; |
458 | fe_code_rate_t *cr; | 457 | fe_code_rate_t *cr; |
459 | u16 tps_val; | 458 | u16 tps_val; |
diff --git a/drivers/media/dvb/frontends/dib3000mc.c b/drivers/media/dvb/frontends/dib3000mc.c index d9ea21001f77..e500b8965a5f 100644 --- a/drivers/media/dvb/frontends/dib3000mc.c +++ b/drivers/media/dvb/frontends/dib3000mc.c | |||
@@ -632,9 +632,9 @@ struct i2c_adapter * dib3000mc_get_tuner_i2c_master(struct dvb_frontend *demod, | |||
632 | 632 | ||
633 | EXPORT_SYMBOL(dib3000mc_get_tuner_i2c_master); | 633 | EXPORT_SYMBOL(dib3000mc_get_tuner_i2c_master); |
634 | 634 | ||
635 | static int dib3000mc_get_frontend(struct dvb_frontend* fe, | 635 | static int dib3000mc_get_frontend(struct dvb_frontend* fe) |
636 | struct dtv_frontend_properties *fep) | ||
637 | { | 636 | { |
637 | struct dtv_frontend_properties *fep = &fe->dtv_property_cache; | ||
638 | struct dib3000mc_state *state = fe->demodulator_priv; | 638 | struct dib3000mc_state *state = fe->demodulator_priv; |
639 | u16 tps = dib3000mc_read_word(state,458); | 639 | u16 tps = dib3000mc_read_word(state,458); |
640 | 640 | ||
@@ -689,7 +689,7 @@ static int dib3000mc_get_frontend(struct dvb_frontend* fe, | |||
689 | 689 | ||
690 | static int dib3000mc_set_frontend(struct dvb_frontend *fe) | 690 | static int dib3000mc_set_frontend(struct dvb_frontend *fe) |
691 | { | 691 | { |
692 | struct dtv_frontend_properties *fep = &fe->dtv_property_cache, tmp; | 692 | struct dtv_frontend_properties *fep = &fe->dtv_property_cache; |
693 | struct dib3000mc_state *state = fe->demodulator_priv; | 693 | struct dib3000mc_state *state = fe->demodulator_priv; |
694 | int ret; | 694 | int ret; |
695 | 695 | ||
@@ -712,8 +712,6 @@ static int dib3000mc_set_frontend(struct dvb_frontend *fe) | |||
712 | fep->code_rate_HP == FEC_AUTO) { | 712 | fep->code_rate_HP == FEC_AUTO) { |
713 | int i = 1000, found; | 713 | int i = 1000, found; |
714 | 714 | ||
715 | tmp = *fep; | ||
716 | |||
717 | dib3000mc_autosearch_start(fe); | 715 | dib3000mc_autosearch_start(fe); |
718 | do { | 716 | do { |
719 | msleep(1); | 717 | msleep(1); |
@@ -724,7 +722,7 @@ static int dib3000mc_set_frontend(struct dvb_frontend *fe) | |||
724 | if (found == 0 || found == 1) | 722 | if (found == 0 || found == 1) |
725 | return 0; // no channel found | 723 | return 0; // no channel found |
726 | 724 | ||
727 | dib3000mc_get_frontend(fe, &tmp); | 725 | dib3000mc_get_frontend(fe); |
728 | } | 726 | } |
729 | 727 | ||
730 | ret = dib3000mc_tune(fe); | 728 | ret = dib3000mc_tune(fe); |
diff --git a/drivers/media/dvb/frontends/dib7000m.c b/drivers/media/dvb/frontends/dib7000m.c index 9f2330d832cf..2a2d6466ecc5 100644 --- a/drivers/media/dvb/frontends/dib7000m.c +++ b/drivers/media/dvb/frontends/dib7000m.c | |||
@@ -1154,9 +1154,9 @@ static int dib7000m_identify(struct dib7000m_state *state) | |||
1154 | } | 1154 | } |
1155 | 1155 | ||
1156 | 1156 | ||
1157 | static int dib7000m_get_frontend(struct dvb_frontend* fe, | 1157 | static int dib7000m_get_frontend(struct dvb_frontend* fe) |
1158 | struct dtv_frontend_properties *fep) | ||
1159 | { | 1158 | { |
1159 | struct dtv_frontend_properties *fep = &fe->dtv_property_cache; | ||
1160 | struct dib7000m_state *state = fe->demodulator_priv; | 1160 | struct dib7000m_state *state = fe->demodulator_priv; |
1161 | u16 tps = dib7000m_read_word(state,480); | 1161 | u16 tps = dib7000m_read_word(state,480); |
1162 | 1162 | ||
@@ -1214,7 +1214,7 @@ static int dib7000m_get_frontend(struct dvb_frontend* fe, | |||
1214 | 1214 | ||
1215 | static int dib7000m_set_frontend(struct dvb_frontend *fe) | 1215 | static int dib7000m_set_frontend(struct dvb_frontend *fe) |
1216 | { | 1216 | { |
1217 | struct dtv_frontend_properties *fep = &fe->dtv_property_cache, tmp; | 1217 | struct dtv_frontend_properties *fep = &fe->dtv_property_cache; |
1218 | struct dib7000m_state *state = fe->demodulator_priv; | 1218 | struct dib7000m_state *state = fe->demodulator_priv; |
1219 | int time, ret; | 1219 | int time, ret; |
1220 | 1220 | ||
@@ -1239,8 +1239,6 @@ static int dib7000m_set_frontend(struct dvb_frontend *fe) | |||
1239 | fep->code_rate_HP == FEC_AUTO) { | 1239 | fep->code_rate_HP == FEC_AUTO) { |
1240 | int i = 800, found; | 1240 | int i = 800, found; |
1241 | 1241 | ||
1242 | tmp = *fep; | ||
1243 | |||
1244 | dib7000m_autosearch_start(fe); | 1242 | dib7000m_autosearch_start(fe); |
1245 | do { | 1243 | do { |
1246 | msleep(1); | 1244 | msleep(1); |
@@ -1251,7 +1249,7 @@ static int dib7000m_set_frontend(struct dvb_frontend *fe) | |||
1251 | if (found == 0 || found == 1) | 1249 | if (found == 0 || found == 1) |
1252 | return 0; // no channel found | 1250 | return 0; // no channel found |
1253 | 1251 | ||
1254 | dib7000m_get_frontend(fe, &tmp); | 1252 | dib7000m_get_frontend(fe); |
1255 | } | 1253 | } |
1256 | 1254 | ||
1257 | ret = dib7000m_tune(fe); | 1255 | ret = dib7000m_tune(fe); |
diff --git a/drivers/media/dvb/frontends/dib7000p.c b/drivers/media/dvb/frontends/dib7000p.c index c92c1a0d7472..361bdb18e3b2 100644 --- a/drivers/media/dvb/frontends/dib7000p.c +++ b/drivers/media/dvb/frontends/dib7000p.c | |||
@@ -1384,9 +1384,9 @@ static int dib7000p_identify(struct dib7000p_state *st) | |||
1384 | return 0; | 1384 | return 0; |
1385 | } | 1385 | } |
1386 | 1386 | ||
1387 | static int dib7000p_get_frontend(struct dvb_frontend *fe, | 1387 | static int dib7000p_get_frontend(struct dvb_frontend *fe) |
1388 | struct dtv_frontend_properties *fep) | ||
1389 | { | 1388 | { |
1389 | struct dtv_frontend_properties *fep = &fe->dtv_property_cache; | ||
1390 | struct dib7000p_state *state = fe->demodulator_priv; | 1390 | struct dib7000p_state *state = fe->demodulator_priv; |
1391 | u16 tps = dib7000p_read_word(state, 463); | 1391 | u16 tps = dib7000p_read_word(state, 463); |
1392 | 1392 | ||
@@ -1482,7 +1482,7 @@ static int dib7000p_get_frontend(struct dvb_frontend *fe, | |||
1482 | 1482 | ||
1483 | static int dib7000p_set_frontend(struct dvb_frontend *fe) | 1483 | static int dib7000p_set_frontend(struct dvb_frontend *fe) |
1484 | { | 1484 | { |
1485 | struct dtv_frontend_properties *fep = &fe->dtv_property_cache, tmp; | 1485 | struct dtv_frontend_properties *fep = &fe->dtv_property_cache; |
1486 | struct dib7000p_state *state = fe->demodulator_priv; | 1486 | struct dib7000p_state *state = fe->demodulator_priv; |
1487 | int time, ret; | 1487 | int time, ret; |
1488 | 1488 | ||
@@ -1509,7 +1509,6 @@ static int dib7000p_set_frontend(struct dvb_frontend *fe) | |||
1509 | fep->guard_interval == GUARD_INTERVAL_AUTO || fep->modulation == QAM_AUTO || fep->code_rate_HP == FEC_AUTO) { | 1509 | fep->guard_interval == GUARD_INTERVAL_AUTO || fep->modulation == QAM_AUTO || fep->code_rate_HP == FEC_AUTO) { |
1510 | int i = 800, found; | 1510 | int i = 800, found; |
1511 | 1511 | ||
1512 | tmp = *fep; | ||
1513 | dib7000p_autosearch_start(fe); | 1512 | dib7000p_autosearch_start(fe); |
1514 | do { | 1513 | do { |
1515 | msleep(1); | 1514 | msleep(1); |
@@ -1520,7 +1519,7 @@ static int dib7000p_set_frontend(struct dvb_frontend *fe) | |||
1520 | if (found == 0 || found == 1) | 1519 | if (found == 0 || found == 1) |
1521 | return 0; | 1520 | return 0; |
1522 | 1521 | ||
1523 | dib7000p_get_frontend(fe, &tmp); | 1522 | dib7000p_get_frontend(fe); |
1524 | } | 1523 | } |
1525 | 1524 | ||
1526 | ret = dib7000p_tune(fe); | 1525 | ret = dib7000p_tune(fe); |
diff --git a/drivers/media/dvb/frontends/dib8000.c b/drivers/media/dvb/frontends/dib8000.c index 115c099d9d28..fe07d74a1f1e 100644 --- a/drivers/media/dvb/frontends/dib8000.c +++ b/drivers/media/dvb/frontends/dib8000.c | |||
@@ -2810,7 +2810,7 @@ int dib8000_set_tune_state(struct dvb_frontend *fe, enum frontend_tune_state tun | |||
2810 | } | 2810 | } |
2811 | EXPORT_SYMBOL(dib8000_set_tune_state); | 2811 | EXPORT_SYMBOL(dib8000_set_tune_state); |
2812 | 2812 | ||
2813 | static int dib8000_get_frontend(struct dvb_frontend *fe, struct dtv_frontend_properties *c) | 2813 | static int dib8000_get_frontend(struct dvb_frontend *fe) |
2814 | { | 2814 | { |
2815 | struct dib8000_state *state = fe->demodulator_priv; | 2815 | struct dib8000_state *state = fe->demodulator_priv; |
2816 | u16 i, val = 0; | 2816 | u16 i, val = 0; |
@@ -2824,7 +2824,7 @@ static int dib8000_get_frontend(struct dvb_frontend *fe, struct dtv_frontend_pro | |||
2824 | if (stat&FE_HAS_SYNC) { | 2824 | if (stat&FE_HAS_SYNC) { |
2825 | dprintk("TMCC lock on the slave%i", index_frontend); | 2825 | dprintk("TMCC lock on the slave%i", index_frontend); |
2826 | /* synchronize the cache with the other frontends */ | 2826 | /* synchronize the cache with the other frontends */ |
2827 | state->fe[index_frontend]->ops.get_frontend(state->fe[index_frontend], c); | 2827 | state->fe[index_frontend]->ops.get_frontend(state->fe[index_frontend]); |
2828 | for (sub_index_frontend = 0; (sub_index_frontend < MAX_NUMBER_OF_FRONTENDS) && (state->fe[sub_index_frontend] != NULL); sub_index_frontend++) { | 2828 | for (sub_index_frontend = 0; (sub_index_frontend < MAX_NUMBER_OF_FRONTENDS) && (state->fe[sub_index_frontend] != NULL); sub_index_frontend++) { |
2829 | if (sub_index_frontend != index_frontend) { | 2829 | if (sub_index_frontend != index_frontend) { |
2830 | state->fe[sub_index_frontend]->dtv_property_cache.isdbt_sb_mode = state->fe[index_frontend]->dtv_property_cache.isdbt_sb_mode; | 2830 | state->fe[sub_index_frontend]->dtv_property_cache.isdbt_sb_mode = state->fe[index_frontend]->dtv_property_cache.isdbt_sb_mode; |
@@ -3088,7 +3088,7 @@ static int dib8000_set_frontend(struct dvb_frontend *fe) | |||
3088 | 3088 | ||
3089 | dprintk("tune success on frontend%i", index_frontend_success); | 3089 | dprintk("tune success on frontend%i", index_frontend_success); |
3090 | 3090 | ||
3091 | dib8000_get_frontend(fe, &state->fe[0]->dtv_property_cache); | 3091 | dib8000_get_frontend(fe); |
3092 | } | 3092 | } |
3093 | 3093 | ||
3094 | for (index_frontend = 0, ret = 0; (ret >= 0) && (index_frontend < MAX_NUMBER_OF_FRONTENDS) && (state->fe[index_frontend] != NULL); index_frontend++) | 3094 | for (index_frontend = 0, ret = 0; (ret >= 0) && (index_frontend < MAX_NUMBER_OF_FRONTENDS) && (state->fe[index_frontend] != NULL); index_frontend++) |
diff --git a/drivers/media/dvb/frontends/dib9000.c b/drivers/media/dvb/frontends/dib9000.c index 974c2b7dc201..2312b4d20d4a 100644 --- a/drivers/media/dvb/frontends/dib9000.c +++ b/drivers/media/dvb/frontends/dib9000.c | |||
@@ -1867,7 +1867,7 @@ static int dib9000_fe_get_tune_settings(struct dvb_frontend *fe, struct dvb_fron | |||
1867 | return 0; | 1867 | return 0; |
1868 | } | 1868 | } |
1869 | 1869 | ||
1870 | static int dib9000_get_frontend(struct dvb_frontend *fe, struct dtv_frontend_properties *c) | 1870 | static int dib9000_get_frontend(struct dvb_frontend *fe) |
1871 | { | 1871 | { |
1872 | struct dib9000_state *state = fe->demodulator_priv; | 1872 | struct dib9000_state *state = fe->demodulator_priv; |
1873 | u8 index_frontend, sub_index_frontend; | 1873 | u8 index_frontend, sub_index_frontend; |
@@ -1883,7 +1883,7 @@ static int dib9000_get_frontend(struct dvb_frontend *fe, struct dtv_frontend_pro | |||
1883 | dprintk("TPS lock on the slave%i", index_frontend); | 1883 | dprintk("TPS lock on the slave%i", index_frontend); |
1884 | 1884 | ||
1885 | /* synchronize the cache with the other frontends */ | 1885 | /* synchronize the cache with the other frontends */ |
1886 | state->fe[index_frontend]->ops.get_frontend(state->fe[index_frontend], c); | 1886 | state->fe[index_frontend]->ops.get_frontend(state->fe[index_frontend]); |
1887 | for (sub_index_frontend = 0; (sub_index_frontend < MAX_NUMBER_OF_FRONTENDS) && (state->fe[sub_index_frontend] != NULL); | 1887 | for (sub_index_frontend = 0; (sub_index_frontend < MAX_NUMBER_OF_FRONTENDS) && (state->fe[sub_index_frontend] != NULL); |
1888 | sub_index_frontend++) { | 1888 | sub_index_frontend++) { |
1889 | if (sub_index_frontend != index_frontend) { | 1889 | if (sub_index_frontend != index_frontend) { |
@@ -2054,7 +2054,7 @@ static int dib9000_set_frontend(struct dvb_frontend *fe) | |||
2054 | 2054 | ||
2055 | /* synchronize all the channel cache */ | 2055 | /* synchronize all the channel cache */ |
2056 | state->get_frontend_internal = 1; | 2056 | state->get_frontend_internal = 1; |
2057 | dib9000_get_frontend(state->fe[0], &state->fe[0]->dtv_property_cache); | 2057 | dib9000_get_frontend(state->fe[0]); |
2058 | state->get_frontend_internal = 0; | 2058 | state->get_frontend_internal = 0; |
2059 | 2059 | ||
2060 | /* retune the other frontends with the found channel */ | 2060 | /* retune the other frontends with the found channel */ |
diff --git a/drivers/media/dvb/frontends/dvb_dummy_fe.c b/drivers/media/dvb/frontends/dvb_dummy_fe.c index c63b024777f7..ac4c8d2221d0 100644 --- a/drivers/media/dvb/frontends/dvb_dummy_fe.c +++ b/drivers/media/dvb/frontends/dvb_dummy_fe.c | |||
@@ -68,8 +68,10 @@ static int dvb_dummy_fe_read_ucblocks(struct dvb_frontend* fe, u32* ucblocks) | |||
68 | return 0; | 68 | return 0; |
69 | } | 69 | } |
70 | 70 | ||
71 | static int dvb_dummy_fe_get_frontend(struct dvb_frontend *fe, | 71 | /* |
72 | struct dtv_frontend_properties *c) | 72 | * Only needed if it actually reads something from the hardware |
73 | */ | ||
74 | static int dvb_dummy_fe_get_frontend(struct dvb_frontend *fe) | ||
73 | { | 75 | { |
74 | return 0; | 76 | return 0; |
75 | } | 77 | } |
diff --git a/drivers/media/dvb/frontends/it913x-fe.c b/drivers/media/dvb/frontends/it913x-fe.c index a75dee83bb3b..754d0f5014c2 100644 --- a/drivers/media/dvb/frontends/it913x-fe.c +++ b/drivers/media/dvb/frontends/it913x-fe.c | |||
@@ -572,9 +572,9 @@ static int it913x_fe_read_ucblocks(struct dvb_frontend *fe, u32 *ucblocks) | |||
572 | return 0; | 572 | return 0; |
573 | } | 573 | } |
574 | 574 | ||
575 | static int it913x_fe_get_frontend(struct dvb_frontend *fe, | 575 | static int it913x_fe_get_frontend(struct dvb_frontend *fe) |
576 | struct dtv_frontend_properties *p) | ||
577 | { | 576 | { |
577 | struct dtv_frontend_properties *p = &fe->dtv_property_cache; | ||
578 | struct it913x_fe_state *state = fe->demodulator_priv; | 578 | struct it913x_fe_state *state = fe->demodulator_priv; |
579 | int ret; | 579 | int ret; |
580 | u8 reg[8]; | 580 | u8 reg[8]; |
diff --git a/drivers/media/dvb/frontends/l64781.c b/drivers/media/dvb/frontends/l64781.c index 247d653f2813..dc3e42cf0245 100644 --- a/drivers/media/dvb/frontends/l64781.c +++ b/drivers/media/dvb/frontends/l64781.c | |||
@@ -243,9 +243,9 @@ static int apply_frontend_param(struct dvb_frontend *fe) | |||
243 | return 0; | 243 | return 0; |
244 | } | 244 | } |
245 | 245 | ||
246 | static int get_frontend(struct dvb_frontend *fe, | 246 | static int get_frontend(struct dvb_frontend *fe) |
247 | struct dtv_frontend_properties *p) | ||
248 | { | 247 | { |
248 | struct dtv_frontend_properties *p = &fe->dtv_property_cache; | ||
249 | struct l64781_state* state = fe->demodulator_priv; | 249 | struct l64781_state* state = fe->demodulator_priv; |
250 | int tmp; | 250 | int tmp; |
251 | 251 | ||
diff --git a/drivers/media/dvb/frontends/lgdt3305.c b/drivers/media/dvb/frontends/lgdt3305.c index 58eb7bc4857a..0b289b27a561 100644 --- a/drivers/media/dvb/frontends/lgdt3305.c +++ b/drivers/media/dvb/frontends/lgdt3305.c | |||
@@ -813,9 +813,9 @@ fail: | |||
813 | return ret; | 813 | return ret; |
814 | } | 814 | } |
815 | 815 | ||
816 | static int lgdt3305_get_frontend(struct dvb_frontend *fe, | 816 | static int lgdt3305_get_frontend(struct dvb_frontend *fe) |
817 | struct dtv_frontend_properties *p) | ||
818 | { | 817 | { |
818 | struct dtv_frontend_properties *p = &fe->dtv_property_cache; | ||
819 | struct lgdt3305_state *state = fe->demodulator_priv; | 819 | struct lgdt3305_state *state = fe->demodulator_priv; |
820 | 820 | ||
821 | lg_dbg("\n"); | 821 | lg_dbg("\n"); |
diff --git a/drivers/media/dvb/frontends/lgdt330x.c b/drivers/media/dvb/frontends/lgdt330x.c index 1979a3824886..0e6f41b7b125 100644 --- a/drivers/media/dvb/frontends/lgdt330x.c +++ b/drivers/media/dvb/frontends/lgdt330x.c | |||
@@ -437,9 +437,9 @@ static int lgdt330x_set_parameters(struct dvb_frontend *fe) | |||
437 | return 0; | 437 | return 0; |
438 | } | 438 | } |
439 | 439 | ||
440 | static int lgdt330x_get_frontend(struct dvb_frontend *fe, | 440 | static int lgdt330x_get_frontend(struct dvb_frontend *fe) |
441 | struct dtv_frontend_properties *p) | ||
442 | { | 441 | { |
442 | struct dtv_frontend_properties *p = &fe->dtv_property_cache; | ||
443 | struct lgdt330x_state *state = fe->demodulator_priv; | 443 | struct lgdt330x_state *state = fe->demodulator_priv; |
444 | p->frequency = state->current_frequency; | 444 | p->frequency = state->current_frequency; |
445 | return 0; | 445 | return 0; |
diff --git a/drivers/media/dvb/frontends/lgs8gl5.c b/drivers/media/dvb/frontends/lgs8gl5.c index 0f4bc1628aea..8f2f43b0ea10 100644 --- a/drivers/media/dvb/frontends/lgs8gl5.c +++ b/drivers/media/dvb/frontends/lgs8gl5.c | |||
@@ -336,9 +336,9 @@ lgs8gl5_set_frontend(struct dvb_frontend *fe) | |||
336 | 336 | ||
337 | 337 | ||
338 | static int | 338 | static int |
339 | lgs8gl5_get_frontend(struct dvb_frontend *fe, | 339 | lgs8gl5_get_frontend(struct dvb_frontend *fe) |
340 | struct dtv_frontend_properties *p) | ||
341 | { | 340 | { |
341 | struct dtv_frontend_properties *p = &fe->dtv_property_cache; | ||
342 | struct lgs8gl5_state *state = fe->demodulator_priv; | 342 | struct lgs8gl5_state *state = fe->demodulator_priv; |
343 | u8 inv = lgs8gl5_read_reg(state, REG_INVERSION); | 343 | u8 inv = lgs8gl5_read_reg(state, REG_INVERSION); |
344 | 344 | ||
diff --git a/drivers/media/dvb/frontends/lgs8gxx.c b/drivers/media/dvb/frontends/lgs8gxx.c index da7d8f6ff9ec..a47add29140d 100644 --- a/drivers/media/dvb/frontends/lgs8gxx.c +++ b/drivers/media/dvb/frontends/lgs8gxx.c | |||
@@ -691,9 +691,9 @@ static int lgs8gxx_set_fe(struct dvb_frontend *fe) | |||
691 | return 0; | 691 | return 0; |
692 | } | 692 | } |
693 | 693 | ||
694 | static int lgs8gxx_get_fe(struct dvb_frontend *fe, | 694 | static int lgs8gxx_get_fe(struct dvb_frontend *fe) |
695 | struct dtv_frontend_properties *fe_params) | ||
696 | { | 695 | { |
696 | struct dtv_frontend_properties *fe_params = &fe->dtv_property_cache; | ||
697 | dprintk("%s\n", __func__); | 697 | dprintk("%s\n", __func__); |
698 | 698 | ||
699 | /* TODO: get real readings from device */ | 699 | /* TODO: get real readings from device */ |
diff --git a/drivers/media/dvb/frontends/mb86a20s.c b/drivers/media/dvb/frontends/mb86a20s.c index d71d6ee2bfd5..4267e517d4c4 100644 --- a/drivers/media/dvb/frontends/mb86a20s.c +++ b/drivers/media/dvb/frontends/mb86a20s.c | |||
@@ -525,9 +525,9 @@ static int mb86a20s_set_frontend(struct dvb_frontend *fe) | |||
525 | return rc; | 525 | return rc; |
526 | } | 526 | } |
527 | 527 | ||
528 | static int mb86a20s_get_frontend(struct dvb_frontend *fe, | 528 | static int mb86a20s_get_frontend(struct dvb_frontend *fe) |
529 | struct dtv_frontend_properties *p) | ||
530 | { | 529 | { |
530 | struct dtv_frontend_properties *p = &fe->dtv_property_cache; | ||
531 | 531 | ||
532 | /* FIXME: For now, it does nothing */ | 532 | /* FIXME: For now, it does nothing */ |
533 | 533 | ||
diff --git a/drivers/media/dvb/frontends/mt312.c b/drivers/media/dvb/frontends/mt312.c index 3e4512aea10e..90aac0d6c36f 100644 --- a/drivers/media/dvb/frontends/mt312.c +++ b/drivers/media/dvb/frontends/mt312.c | |||
@@ -636,9 +636,9 @@ static int mt312_set_frontend(struct dvb_frontend *fe) | |||
636 | return 0; | 636 | return 0; |
637 | } | 637 | } |
638 | 638 | ||
639 | static int mt312_get_frontend(struct dvb_frontend *fe, | 639 | static int mt312_get_frontend(struct dvb_frontend *fe) |
640 | struct dtv_frontend_properties *p) | ||
641 | { | 640 | { |
641 | struct dtv_frontend_properties *p = &fe->dtv_property_cache; | ||
642 | struct mt312_state *state = fe->demodulator_priv; | 642 | struct mt312_state *state = fe->demodulator_priv; |
643 | int ret; | 643 | int ret; |
644 | 644 | ||
diff --git a/drivers/media/dvb/frontends/mt352.c b/drivers/media/dvb/frontends/mt352.c index e6b2795b2fc8..0321eec894bc 100644 --- a/drivers/media/dvb/frontends/mt352.c +++ b/drivers/media/dvb/frontends/mt352.c | |||
@@ -311,9 +311,9 @@ static int mt352_set_parameters(struct dvb_frontend *fe) | |||
311 | return 0; | 311 | return 0; |
312 | } | 312 | } |
313 | 313 | ||
314 | static int mt352_get_parameters(struct dvb_frontend* fe, | 314 | static int mt352_get_parameters(struct dvb_frontend* fe) |
315 | struct dtv_frontend_properties *op) | ||
316 | { | 315 | { |
316 | struct dtv_frontend_properties *op = &fe->dtv_property_cache; | ||
317 | struct mt352_state* state = fe->demodulator_priv; | 317 | struct mt352_state* state = fe->demodulator_priv; |
318 | u16 tps; | 318 | u16 tps; |
319 | u16 div; | 319 | u16 div; |
diff --git a/drivers/media/dvb/frontends/or51132.c b/drivers/media/dvb/frontends/or51132.c index 1fc7778a58c8..82ee29590e7f 100644 --- a/drivers/media/dvb/frontends/or51132.c +++ b/drivers/media/dvb/frontends/or51132.c | |||
@@ -375,9 +375,9 @@ static int or51132_set_parameters(struct dvb_frontend *fe) | |||
375 | return 0; | 375 | return 0; |
376 | } | 376 | } |
377 | 377 | ||
378 | static int or51132_get_parameters(struct dvb_frontend* fe, | 378 | static int or51132_get_parameters(struct dvb_frontend* fe) |
379 | struct dtv_frontend_properties *p) | ||
380 | { | 379 | { |
380 | struct dtv_frontend_properties *p = &fe->dtv_property_cache; | ||
381 | struct or51132_state* state = fe->demodulator_priv; | 381 | struct or51132_state* state = fe->demodulator_priv; |
382 | int status; | 382 | int status; |
383 | int retry = 1; | 383 | int retry = 1; |
diff --git a/drivers/media/dvb/frontends/s5h1409.c b/drivers/media/dvb/frontends/s5h1409.c index 2641fd51286d..21baea8902c3 100644 --- a/drivers/media/dvb/frontends/s5h1409.c +++ b/drivers/media/dvb/frontends/s5h1409.c | |||
@@ -925,9 +925,9 @@ static int s5h1409_read_ber(struct dvb_frontend *fe, u32 *ber) | |||
925 | return s5h1409_read_ucblocks(fe, ber); | 925 | return s5h1409_read_ucblocks(fe, ber); |
926 | } | 926 | } |
927 | 927 | ||
928 | static int s5h1409_get_frontend(struct dvb_frontend *fe, | 928 | static int s5h1409_get_frontend(struct dvb_frontend *fe) |
929 | struct dtv_frontend_properties *p) | ||
930 | { | 929 | { |
930 | struct dtv_frontend_properties *p = &fe->dtv_property_cache; | ||
931 | struct s5h1409_state *state = fe->demodulator_priv; | 931 | struct s5h1409_state *state = fe->demodulator_priv; |
932 | 932 | ||
933 | p->frequency = state->current_frequency; | 933 | p->frequency = state->current_frequency; |
diff --git a/drivers/media/dvb/frontends/s5h1411.c b/drivers/media/dvb/frontends/s5h1411.c index 08f568c54f4d..b8c7feb51015 100644 --- a/drivers/media/dvb/frontends/s5h1411.c +++ b/drivers/media/dvb/frontends/s5h1411.c | |||
@@ -840,9 +840,9 @@ static int s5h1411_read_ber(struct dvb_frontend *fe, u32 *ber) | |||
840 | return s5h1411_read_ucblocks(fe, ber); | 840 | return s5h1411_read_ucblocks(fe, ber); |
841 | } | 841 | } |
842 | 842 | ||
843 | static int s5h1411_get_frontend(struct dvb_frontend *fe, | 843 | static int s5h1411_get_frontend(struct dvb_frontend *fe) |
844 | struct dtv_frontend_properties *p) | ||
845 | { | 844 | { |
845 | struct dtv_frontend_properties *p = &fe->dtv_property_cache; | ||
846 | struct s5h1411_state *state = fe->demodulator_priv; | 846 | struct s5h1411_state *state = fe->demodulator_priv; |
847 | 847 | ||
848 | p->frequency = state->current_frequency; | 848 | p->frequency = state->current_frequency; |
diff --git a/drivers/media/dvb/frontends/s5h1420.c b/drivers/media/dvb/frontends/s5h1420.c index 9a65a7f8dec5..d83d20acc873 100644 --- a/drivers/media/dvb/frontends/s5h1420.c +++ b/drivers/media/dvb/frontends/s5h1420.c | |||
@@ -765,9 +765,9 @@ static int s5h1420_set_frontend(struct dvb_frontend *fe) | |||
765 | return 0; | 765 | return 0; |
766 | } | 766 | } |
767 | 767 | ||
768 | static int s5h1420_get_frontend(struct dvb_frontend* fe, | 768 | static int s5h1420_get_frontend(struct dvb_frontend* fe) |
769 | struct dtv_frontend_properties *p) | ||
770 | { | 769 | { |
770 | struct dtv_frontend_properties *p = &fe->dtv_property_cache; | ||
771 | struct s5h1420_state* state = fe->demodulator_priv; | 771 | struct s5h1420_state* state = fe->demodulator_priv; |
772 | 772 | ||
773 | p->frequency = state->tunedfreq + s5h1420_getfreqoffset(state); | 773 | p->frequency = state->tunedfreq + s5h1420_getfreqoffset(state); |
diff --git a/drivers/media/dvb/frontends/s921.c b/drivers/media/dvb/frontends/s921.c index 7652d3fac766..6012e1045d31 100644 --- a/drivers/media/dvb/frontends/s921.c +++ b/drivers/media/dvb/frontends/s921.c | |||
@@ -433,9 +433,9 @@ static int s921_set_frontend(struct dvb_frontend *fe) | |||
433 | return 0; | 433 | return 0; |
434 | } | 434 | } |
435 | 435 | ||
436 | static int s921_get_frontend(struct dvb_frontend *fe, | 436 | static int s921_get_frontend(struct dvb_frontend *fe) |
437 | struct dtv_frontend_properties *p) | ||
438 | { | 437 | { |
438 | struct dtv_frontend_properties *p = &fe->dtv_property_cache; | ||
439 | struct s921_state *state = fe->demodulator_priv; | 439 | struct s921_state *state = fe->demodulator_priv; |
440 | 440 | ||
441 | /* FIXME: Probably it is possible to get it from regs f1 and f2 */ | 441 | /* FIXME: Probably it is possible to get it from regs f1 and f2 */ |
diff --git a/drivers/media/dvb/frontends/stb0899_drv.c b/drivers/media/dvb/frontends/stb0899_drv.c index 9fad6274f19b..c9e178526ed1 100644 --- a/drivers/media/dvb/frontends/stb0899_drv.c +++ b/drivers/media/dvb/frontends/stb0899_drv.c | |||
@@ -1569,8 +1569,9 @@ static enum dvbfe_search stb0899_search(struct dvb_frontend *fe) | |||
1569 | return DVBFE_ALGO_SEARCH_ERROR; | 1569 | return DVBFE_ALGO_SEARCH_ERROR; |
1570 | } | 1570 | } |
1571 | 1571 | ||
1572 | static int stb0899_get_frontend(struct dvb_frontend *fe, struct dtv_frontend_properties *p) | 1572 | static int stb0899_get_frontend(struct dvb_frontend *fe) |
1573 | { | 1573 | { |
1574 | struct dtv_frontend_properties *p = &fe->dtv_property_cache; | ||
1574 | struct stb0899_state *state = fe->demodulator_priv; | 1575 | struct stb0899_state *state = fe->demodulator_priv; |
1575 | struct stb0899_internal *internal = &state->internal; | 1576 | struct stb0899_internal *internal = &state->internal; |
1576 | 1577 | ||
diff --git a/drivers/media/dvb/frontends/stb6100.c b/drivers/media/dvb/frontends/stb6100.c index a56676399346..2d7c901905ba 100644 --- a/drivers/media/dvb/frontends/stb6100.c +++ b/drivers/media/dvb/frontends/stb6100.c | |||
@@ -337,7 +337,7 @@ static int stb6100_set_frequency(struct dvb_frontend *fe, u32 frequency) | |||
337 | 337 | ||
338 | if (fe->ops.get_frontend) { | 338 | if (fe->ops.get_frontend) { |
339 | dprintk(verbose, FE_DEBUG, 1, "Get frontend parameters"); | 339 | dprintk(verbose, FE_DEBUG, 1, "Get frontend parameters"); |
340 | fe->ops.get_frontend(fe, &p); | 340 | fe->ops.get_frontend(fe); |
341 | } | 341 | } |
342 | srate = p.symbol_rate; | 342 | srate = p.symbol_rate; |
343 | 343 | ||
diff --git a/drivers/media/dvb/frontends/stv0297.c b/drivers/media/dvb/frontends/stv0297.c index 88e8e52e308a..dd0a1903e745 100644 --- a/drivers/media/dvb/frontends/stv0297.c +++ b/drivers/media/dvb/frontends/stv0297.c | |||
@@ -614,8 +614,9 @@ timeout: | |||
614 | return 0; | 614 | return 0; |
615 | } | 615 | } |
616 | 616 | ||
617 | static int stv0297_get_frontend(struct dvb_frontend *fe, struct dtv_frontend_properties *p) | 617 | static int stv0297_get_frontend(struct dvb_frontend *fe) |
618 | { | 618 | { |
619 | struct dtv_frontend_properties *p = &fe->dtv_property_cache; | ||
619 | struct stv0297_state *state = fe->demodulator_priv; | 620 | struct stv0297_state *state = fe->demodulator_priv; |
620 | int reg_00, reg_83; | 621 | int reg_00, reg_83; |
621 | 622 | ||
diff --git a/drivers/media/dvb/frontends/stv0299.c b/drivers/media/dvb/frontends/stv0299.c index 92adf90581dd..a7abc82f0894 100644 --- a/drivers/media/dvb/frontends/stv0299.c +++ b/drivers/media/dvb/frontends/stv0299.c | |||
@@ -596,8 +596,9 @@ static int stv0299_set_frontend(struct dvb_frontend *fe) | |||
596 | return 0; | 596 | return 0; |
597 | } | 597 | } |
598 | 598 | ||
599 | static int stv0299_get_frontend(struct dvb_frontend *fe, struct dtv_frontend_properties * p) | 599 | static int stv0299_get_frontend(struct dvb_frontend *fe) |
600 | { | 600 | { |
601 | struct dtv_frontend_properties *p = &fe->dtv_property_cache; | ||
601 | struct stv0299_state* state = fe->demodulator_priv; | 602 | struct stv0299_state* state = fe->demodulator_priv; |
602 | s32 derot_freq; | 603 | s32 derot_freq; |
603 | int invval; | 604 | int invval; |
diff --git a/drivers/media/dvb/frontends/stv0367.c b/drivers/media/dvb/frontends/stv0367.c index 7c8964f67ad3..6786b9e4a86c 100644 --- a/drivers/media/dvb/frontends/stv0367.c +++ b/drivers/media/dvb/frontends/stv0367.c | |||
@@ -1926,9 +1926,9 @@ static int stv0367ter_read_ucblocks(struct dvb_frontend *fe, u32 *ucblocks) | |||
1926 | return 0; | 1926 | return 0; |
1927 | } | 1927 | } |
1928 | 1928 | ||
1929 | static int stv0367ter_get_frontend(struct dvb_frontend *fe, | 1929 | static int stv0367ter_get_frontend(struct dvb_frontend *fe) |
1930 | struct dtv_frontend_properties *p) | ||
1931 | { | 1930 | { |
1931 | struct dtv_frontend_properties *p = &fe->dtv_property_cache; | ||
1932 | struct stv0367_state *state = fe->demodulator_priv; | 1932 | struct stv0367_state *state = fe->demodulator_priv; |
1933 | struct stv0367ter_state *ter_state = state->ter_state; | 1933 | struct stv0367ter_state *ter_state = state->ter_state; |
1934 | 1934 | ||
@@ -3136,9 +3136,9 @@ static int stv0367cab_set_frontend(struct dvb_frontend *fe) | |||
3136 | return 0; | 3136 | return 0; |
3137 | } | 3137 | } |
3138 | 3138 | ||
3139 | static int stv0367cab_get_frontend(struct dvb_frontend *fe, | 3139 | static int stv0367cab_get_frontend(struct dvb_frontend *fe) |
3140 | struct dtv_frontend_properties *p) | ||
3141 | { | 3140 | { |
3141 | struct dtv_frontend_properties *p = &fe->dtv_property_cache; | ||
3142 | struct stv0367_state *state = fe->demodulator_priv; | 3142 | struct stv0367_state *state = fe->demodulator_priv; |
3143 | struct stv0367cab_state *cab_state = state->cab_state; | 3143 | struct stv0367cab_state *cab_state = state->cab_state; |
3144 | 3144 | ||
diff --git a/drivers/media/dvb/frontends/stv0900_core.c b/drivers/media/dvb/frontends/stv0900_core.c index 8af1e6245160..33325ae41b8a 100644 --- a/drivers/media/dvb/frontends/stv0900_core.c +++ b/drivers/media/dvb/frontends/stv0900_core.c | |||
@@ -1843,9 +1843,9 @@ static int stv0900_sleep(struct dvb_frontend *fe) | |||
1843 | return 0; | 1843 | return 0; |
1844 | } | 1844 | } |
1845 | 1845 | ||
1846 | static int stv0900_get_frontend(struct dvb_frontend *fe, | 1846 | static int stv0900_get_frontend(struct dvb_frontend *fe) |
1847 | struct dtv_frontend_properties *p) | ||
1848 | { | 1847 | { |
1848 | struct dtv_frontend_properties *p = &fe->dtv_property_cache; | ||
1849 | struct stv0900_state *state = fe->demodulator_priv; | 1849 | struct stv0900_state *state = fe->demodulator_priv; |
1850 | struct stv0900_internal *intp = state->internal; | 1850 | struct stv0900_internal *intp = state->internal; |
1851 | enum fe_stv0900_demod_num demod = state->demod; | 1851 | enum fe_stv0900_demod_num demod = state->demod; |
diff --git a/drivers/media/dvb/frontends/tda10021.c b/drivers/media/dvb/frontends/tda10021.c index 051c6bf9b68b..a3308318f88e 100644 --- a/drivers/media/dvb/frontends/tda10021.c +++ b/drivers/media/dvb/frontends/tda10021.c | |||
@@ -386,8 +386,9 @@ static int tda10021_read_ucblocks(struct dvb_frontend* fe, u32* ucblocks) | |||
386 | return 0; | 386 | return 0; |
387 | } | 387 | } |
388 | 388 | ||
389 | static int tda10021_get_frontend(struct dvb_frontend *fe, struct dtv_frontend_properties *p) | 389 | static int tda10021_get_frontend(struct dvb_frontend *fe) |
390 | { | 390 | { |
391 | struct dtv_frontend_properties *p = &fe->dtv_property_cache; | ||
391 | struct tda10021_state* state = fe->demodulator_priv; | 392 | struct tda10021_state* state = fe->demodulator_priv; |
392 | int sync; | 393 | int sync; |
393 | s8 afc = 0; | 394 | s8 afc = 0; |
diff --git a/drivers/media/dvb/frontends/tda10023.c b/drivers/media/dvb/frontends/tda10023.c index 2766b6435ac9..d0b8e86fc879 100644 --- a/drivers/media/dvb/frontends/tda10023.c +++ b/drivers/media/dvb/frontends/tda10023.c | |||
@@ -456,8 +456,9 @@ static int tda10023_read_ucblocks(struct dvb_frontend* fe, u32* ucblocks) | |||
456 | return 0; | 456 | return 0; |
457 | } | 457 | } |
458 | 458 | ||
459 | static int tda10023_get_frontend(struct dvb_frontend *fe, struct dtv_frontend_properties *p) | 459 | static int tda10023_get_frontend(struct dvb_frontend *fe) |
460 | { | 460 | { |
461 | struct dtv_frontend_properties *p = &fe->dtv_property_cache; | ||
461 | struct tda10023_state* state = fe->demodulator_priv; | 462 | struct tda10023_state* state = fe->demodulator_priv; |
462 | int sync,inv; | 463 | int sync,inv; |
463 | s8 afc = 0; | 464 | s8 afc = 0; |
diff --git a/drivers/media/dvb/frontends/tda10048.c b/drivers/media/dvb/frontends/tda10048.c index dfd1d5ac1825..99bf0c0f97b7 100644 --- a/drivers/media/dvb/frontends/tda10048.c +++ b/drivers/media/dvb/frontends/tda10048.c | |||
@@ -1028,9 +1028,9 @@ static int tda10048_read_ucblocks(struct dvb_frontend *fe, u32 *ucblocks) | |||
1028 | return 0; | 1028 | return 0; |
1029 | } | 1029 | } |
1030 | 1030 | ||
1031 | static int tda10048_get_frontend(struct dvb_frontend *fe, | 1031 | static int tda10048_get_frontend(struct dvb_frontend *fe) |
1032 | struct dtv_frontend_properties *p) | ||
1033 | { | 1032 | { |
1033 | struct dtv_frontend_properties *p = &fe->dtv_property_cache; | ||
1034 | struct tda10048_state *state = fe->demodulator_priv; | 1034 | struct tda10048_state *state = fe->demodulator_priv; |
1035 | 1035 | ||
1036 | dprintk(1, "%s()\n", __func__); | 1036 | dprintk(1, "%s()\n", __func__); |
diff --git a/drivers/media/dvb/frontends/tda1004x.c b/drivers/media/dvb/frontends/tda1004x.c index fe5b659a9e6b..bbab4a13ff33 100644 --- a/drivers/media/dvb/frontends/tda1004x.c +++ b/drivers/media/dvb/frontends/tda1004x.c | |||
@@ -895,8 +895,9 @@ static int tda1004x_set_fe(struct dvb_frontend *fe) | |||
895 | return 0; | 895 | return 0; |
896 | } | 896 | } |
897 | 897 | ||
898 | static int tda1004x_get_fe(struct dvb_frontend *fe, struct dtv_frontend_properties *fe_params) | 898 | static int tda1004x_get_fe(struct dvb_frontend *fe) |
899 | { | 899 | { |
900 | struct dtv_frontend_properties *fe_params = &fe->dtv_property_cache; | ||
900 | struct tda1004x_state* state = fe->demodulator_priv; | 901 | struct tda1004x_state* state = fe->demodulator_priv; |
901 | 902 | ||
902 | dprintk("%s\n", __func__); | 903 | dprintk("%s\n", __func__); |
diff --git a/drivers/media/dvb/frontends/tda10071.c b/drivers/media/dvb/frontends/tda10071.c index 68dcce6644eb..54e2aa0c4f8d 100644 --- a/drivers/media/dvb/frontends/tda10071.c +++ b/drivers/media/dvb/frontends/tda10071.c | |||
@@ -776,8 +776,7 @@ error: | |||
776 | return ret; | 776 | return ret; |
777 | } | 777 | } |
778 | 778 | ||
779 | static int tda10071_get_frontend(struct dvb_frontend *fe, | 779 | static int tda10071_get_frontend(struct dvb_frontend *fe) |
780 | struct dtv_frontend_properties *p) | ||
781 | { | 780 | { |
782 | struct tda10071_priv *priv = fe->demodulator_priv; | 781 | struct tda10071_priv *priv = fe->demodulator_priv; |
783 | struct dtv_frontend_properties *c = &fe->dtv_property_cache; | 782 | struct dtv_frontend_properties *c = &fe->dtv_property_cache; |
diff --git a/drivers/media/dvb/frontends/tda10086.c b/drivers/media/dvb/frontends/tda10086.c index b94fe95238e3..e0d2fc1031f8 100644 --- a/drivers/media/dvb/frontends/tda10086.c +++ b/drivers/media/dvb/frontends/tda10086.c | |||
@@ -457,8 +457,9 @@ static int tda10086_set_frontend(struct dvb_frontend *fe) | |||
457 | return 0; | 457 | return 0; |
458 | } | 458 | } |
459 | 459 | ||
460 | static int tda10086_get_frontend(struct dvb_frontend *fe, struct dtv_frontend_properties *fe_params) | 460 | static int tda10086_get_frontend(struct dvb_frontend *fe) |
461 | { | 461 | { |
462 | struct dtv_frontend_properties *fe_params = &fe->dtv_property_cache; | ||
462 | struct tda10086_state* state = fe->demodulator_priv; | 463 | struct tda10086_state* state = fe->demodulator_priv; |
463 | u8 val; | 464 | u8 val; |
464 | int tmp; | 465 | int tmp; |
diff --git a/drivers/media/dvb/frontends/tda8083.c b/drivers/media/dvb/frontends/tda8083.c index 0f9841c07c3f..b613dfc640ed 100644 --- a/drivers/media/dvb/frontends/tda8083.c +++ b/drivers/media/dvb/frontends/tda8083.c | |||
@@ -335,8 +335,9 @@ static int tda8083_set_frontend(struct dvb_frontend *fe) | |||
335 | return 0; | 335 | return 0; |
336 | } | 336 | } |
337 | 337 | ||
338 | static int tda8083_get_frontend(struct dvb_frontend *fe, struct dtv_frontend_properties *p) | 338 | static int tda8083_get_frontend(struct dvb_frontend *fe) |
339 | { | 339 | { |
340 | struct dtv_frontend_properties *p = &fe->dtv_property_cache; | ||
340 | struct tda8083_state* state = fe->demodulator_priv; | 341 | struct tda8083_state* state = fe->demodulator_priv; |
341 | 342 | ||
342 | /* FIXME: get symbolrate & frequency offset...*/ | 343 | /* FIXME: get symbolrate & frequency offset...*/ |
diff --git a/drivers/media/dvb/frontends/ves1820.c b/drivers/media/dvb/frontends/ves1820.c index ecc685b3ab3c..e85a823665ff 100644 --- a/drivers/media/dvb/frontends/ves1820.c +++ b/drivers/media/dvb/frontends/ves1820.c | |||
@@ -310,8 +310,9 @@ static int ves1820_read_ucblocks(struct dvb_frontend* fe, u32* ucblocks) | |||
310 | return 0; | 310 | return 0; |
311 | } | 311 | } |
312 | 312 | ||
313 | static int ves1820_get_frontend(struct dvb_frontend *fe, struct dtv_frontend_properties *p) | 313 | static int ves1820_get_frontend(struct dvb_frontend *fe) |
314 | { | 314 | { |
315 | struct dtv_frontend_properties *p = &fe->dtv_property_cache; | ||
315 | struct ves1820_state* state = fe->demodulator_priv; | 316 | struct ves1820_state* state = fe->demodulator_priv; |
316 | int sync; | 317 | int sync; |
317 | s8 afc = 0; | 318 | s8 afc = 0; |
diff --git a/drivers/media/dvb/frontends/ves1x93.c b/drivers/media/dvb/frontends/ves1x93.c index 54c70b07d815..0ccd8515738f 100644 --- a/drivers/media/dvb/frontends/ves1x93.c +++ b/drivers/media/dvb/frontends/ves1x93.c | |||
@@ -403,9 +403,9 @@ static int ves1x93_set_frontend(struct dvb_frontend *fe) | |||
403 | return 0; | 403 | return 0; |
404 | } | 404 | } |
405 | 405 | ||
406 | static int ves1x93_get_frontend(struct dvb_frontend *fe, | 406 | static int ves1x93_get_frontend(struct dvb_frontend *fe) |
407 | struct dtv_frontend_properties *p) | ||
408 | { | 407 | { |
408 | struct dtv_frontend_properties *p = &fe->dtv_property_cache; | ||
409 | struct ves1x93_state* state = fe->demodulator_priv; | 409 | struct ves1x93_state* state = fe->demodulator_priv; |
410 | int afc; | 410 | int afc; |
411 | 411 | ||
diff --git a/drivers/media/dvb/frontends/zl10353.c b/drivers/media/dvb/frontends/zl10353.c index 39c1bdbc1ce3..816fa861c066 100644 --- a/drivers/media/dvb/frontends/zl10353.c +++ b/drivers/media/dvb/frontends/zl10353.c | |||
@@ -371,9 +371,9 @@ static int zl10353_set_parameters(struct dvb_frontend *fe) | |||
371 | return 0; | 371 | return 0; |
372 | } | 372 | } |
373 | 373 | ||
374 | static int zl10353_get_parameters(struct dvb_frontend *fe, | 374 | static int zl10353_get_parameters(struct dvb_frontend *fe) |
375 | struct dtv_frontend_properties *c) | ||
376 | { | 375 | { |
376 | struct dtv_frontend_properties *c = &fe->dtv_property_cache; | ||
377 | struct zl10353_state *state = fe->demodulator_priv; | 377 | struct zl10353_state *state = fe->demodulator_priv; |
378 | int s6, s9; | 378 | int s6, s9; |
379 | u16 tps; | 379 | u16 tps; |