p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

media: dvb_frontend: get rid of get_property() callback 

Only lg2160 implement gets_property, but there's no need for that,
as no other driver calls this callback, as get_frontend() does the
same, and set_frontend() also calls lg2160 get_frontend().

So, get rid of it.

Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Reviewed-by: Michael Ira Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
This commit is contained in:
Mauro Carvalho Chehab 2017-09-14 07:44:20 -04:00
parent b2c41ca963
commit 8f8a19fcc1
3 changed files with 1 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/media/dvb-core/dvb_frontend.c
View File

@ -1308,7 +1308,7 @@ static int dtv_property_process_get(struct dvb_frontend *fe,
struct dtv_property *tvp, struct dtv_property *tvp,
struct file *file) struct file *file)
{ {
int r, ncaps; int ncaps;
switch(tvp->cmd) { switch(tvp->cmd) {
case DTV_ENUM_DELSYS: case DTV_ENUM_DELSYS:
@ -1519,13 +1519,6 @@ static int dtv_property_process_get(struct dvb_frontend *fe,
return -EINVAL; return -EINVAL;
} }
/* Allow the frontend to override outgoing properties */
if (fe->ops.get_property) {
r = fe->ops.get_property(fe, tvp);
if (r < 0)
return r;
}
dtv_property_dump(fe, false, tvp); dtv_property_dump(fe, false, tvp);
return 0; return 0;

3
drivers/media/dvb-core/dvb_frontend.h
View File

@ -403,8 +403,6 @@ struct dtv_frontend_properties;
* @analog_ops: pointer to struct analog_demod_ops * @analog_ops: pointer to struct analog_demod_ops
* @set_property: callback function to allow the frontend to validade * @set_property: callback function to allow the frontend to validade
* incoming properties. Should not be used on new drivers. * incoming properties. Should not be used on new drivers.
* @get_property: callback function to allow the frontend to override
* outcoming properties. Should not be used on new drivers.
*/ */
struct dvb_frontend_ops { struct dvb_frontend_ops {
@ -468,7 +466,6 @@ struct dvb_frontend_ops {
struct analog_demod_ops analog_ops; struct analog_demod_ops analog_ops;
int (*set_property)(struct dvb_frontend* fe, struct dtv_property* tvp); int (*set_property)(struct dvb_frontend* fe, struct dtv_property* tvp);
int (*get_property)(struct dvb_frontend* fe, struct dtv_property* tvp);
}; };
#ifdef __DVB_CORE__ #ifdef __DVB_CORE__

14
drivers/media/dvb-frontends/lg2160.c
View File

@ -1048,16 +1048,6 @@ static int lg216x_get_frontend(struct dvb_frontend *fe,
return ret; return ret;
} }
static int lg216x_get_property(struct dvb_frontend *fe,
struct dtv_property *tvp)
{
struct dtv_frontend_properties *c = &fe->dtv_property_cache;
return (DTV_ATSCMH_FIC_VER == tvp->cmd) ?
lg216x_get_frontend(fe, c) : 0;
}
static int lg2160_set_frontend(struct dvb_frontend *fe) static int lg2160_set_frontend(struct dvb_frontend *fe)
{ {
struct lg216x_state *state = fe->demodulator_priv; struct lg216x_state *state = fe->demodulator_priv;
@ -1368,8 +1358,6 @@ static const struct dvb_frontend_ops lg2160_ops = {
.init = lg216x_init, .init = lg216x_init,
.sleep = lg216x_sleep, .sleep = lg216x_sleep,
#endif #endif
.get_property = lg216x_get_property,
.set_frontend = lg2160_set_frontend, .set_frontend = lg2160_set_frontend,
.get_frontend = lg216x_get_frontend, .get_frontend = lg216x_get_frontend,
.get_tune_settings = lg216x_get_tune_settings, .get_tune_settings = lg216x_get_tune_settings,
@ -1396,8 +1384,6 @@ static const struct dvb_frontend_ops lg2161_ops = {
.init = lg216x_init, .init = lg216x_init,
.sleep = lg216x_sleep, .sleep = lg216x_sleep,
#endif #endif
.get_property = lg216x_get_property,
.set_frontend = lg2160_set_frontend, .set_frontend = lg2160_set_frontend,
.get_frontend = lg216x_get_frontend, .get_frontend = lg216x_get_frontend,
.get_tune_settings = lg216x_get_tune_settings, .get_tune_settings = lg216x_get_tune_settings,