Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8f8a19fc authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

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: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
Reviewed-by: default avatarMichael Ira Krufky <mkrufky@linuxtv.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent b2c41ca9

drivers/media/dvb-core/dvb_frontend.c

+1 −8
Original line number Diff line number Diff line
@@ -1308,7 +1308,7 @@ static int dtv_property_process_get(struct dvb_frontend *fe, 
				    struct dtv_property *tvp,

				    struct file *file)

{

	int r, ncaps;

	int ncaps;



	switch(tvp->cmd) {

	case DTV_ENUM_DELSYS:
@@ -1519,13 +1519,6 @@ static int dtv_property_process_get(struct dvb_frontend *fe, 
		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);



	return 0;

drivers/media/dvb-core/dvb_frontend.h

+0 −3
Original line number Diff line number Diff line
@@ -403,8 +403,6 @@ struct dtv_frontend_properties; 
 * @analog_ops:		pointer to struct analog_demod_ops

 * @set_property:	callback function to allow the frontend to validade

 *			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 {
@@ -468,7 +466,6 @@ struct dvb_frontend_ops { 
	struct analog_demod_ops analog_ops;



	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__

drivers/media/dvb-frontends/lg2160.c

+0 −14
Original line number Diff line number Diff line
@@ -1048,16 +1048,6 @@ static int lg216x_get_frontend(struct dvb_frontend *fe, 
	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)

{

	struct lg216x_state *state = fe->demodulator_priv;
@@ -1368,8 +1358,6 @@ static const struct dvb_frontend_ops lg2160_ops = { 
	.init                 = lg216x_init,

	.sleep                = lg216x_sleep,

#endif

	.get_property         = lg216x_get_property,



	.set_frontend         = lg2160_set_frontend,

	.get_frontend         = lg216x_get_frontend,

	.get_tune_settings    = lg216x_get_tune_settings,
@@ -1396,8 +1384,6 @@ static const struct dvb_frontend_ops lg2161_ops = { 
	.init                 = lg216x_init,

	.sleep                = lg216x_sleep,

#endif

	.get_property         = lg216x_get_property,



	.set_frontend         = lg2160_set_frontend,

	.get_frontend         = lg216x_get_frontend,

	.get_tune_settings    = lg216x_get_tune_settings,