aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/dvb/frontends/dib3000mb.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2011-12-30 09:30:21 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-12-31 07:28:23 -0500
commit7c61d80a9bcfc3fdec8ffd75756cad6a64678229 (patch)
treecd62cf4852ba56a7a5f12cc630cae44000393f34 /drivers/media/dvb/frontends/dib3000mb.c
parentac3852c41b36cb408bea1400892dd6c61c3b225a (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/dib3000mb.c')
-rw-r--r--drivers/media/dvb/frontends/dib3000mb.c9
1 files changed, 4 insertions, 5 deletions
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
115static int dib3000mb_get_frontend(struct dvb_frontend* fe, 115static int dib3000mb_get_frontend(struct dvb_frontend* fe);
116 struct dtv_frontend_properties *c);
117 116
118static int dib3000mb_set_frontend(struct dvb_frontend *fe, int tuner) 117static 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
454static int dib3000mb_get_frontend(struct dvb_frontend* fe, 453static 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;