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

Commit bc9cd273 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

[media] Rename set_frontend fops to set_frontend_legacy 



Passing DVBv3 parameters to set_frontend is not fun, as the
core doesn't have any way to know if the driver is using the
v3 or v5 parameters. So, rename the callback and add a new
one to allow distinguish between a mixed v3/v5 paramenter call
from a pure v5 call.

After having all frontends to use the new way, the legacy
call can be removed.

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent eeacf147

drivers/media/dvb/bt8xx/dst.c

+4 −4
Original line number Diff line number Diff line
@@ -1777,7 +1777,7 @@ static struct dvb_frontend_ops dst_dvbt_ops = { 
	.release = dst_release,

	.init = dst_init,

	.tune = dst_tune_frontend,

	.set_frontend = dst_set_frontend,

	.set_frontend_legacy = dst_set_frontend,

	.get_frontend = dst_get_frontend,

	.get_frontend_algo = dst_get_tuning_algo,

	.read_status = dst_read_status,
@@ -1803,7 +1803,7 @@ static struct dvb_frontend_ops dst_dvbs_ops = { 
	.release = dst_release,

	.init = dst_init,

	.tune = dst_tune_frontend,

	.set_frontend = dst_set_frontend,

	.set_frontend_legacy = dst_set_frontend,

	.get_frontend = dst_get_frontend,

	.get_frontend_algo = dst_get_tuning_algo,

	.read_status = dst_read_status,
@@ -1837,7 +1837,7 @@ static struct dvb_frontend_ops dst_dvbc_ops = { 
	.release = dst_release,

	.init = dst_init,

	.tune = dst_tune_frontend,

	.set_frontend = dst_set_frontend,

	.set_frontend_legacy = dst_set_frontend,

	.get_frontend = dst_get_frontend,

	.get_frontend_algo = dst_get_tuning_algo,

	.read_status = dst_read_status,
@@ -1860,7 +1860,7 @@ static struct dvb_frontend_ops dst_atsc_ops = { 
	.release = dst_release,

	.init = dst_init,

	.tune = dst_tune_frontend,

	.set_frontend = dst_set_frontend,

	.set_frontend_legacy = dst_set_frontend,

	.get_frontend = dst_get_frontend,

	.get_frontend_algo = dst_get_tuning_algo,

	.read_status = dst_read_status,

drivers/media/dvb/dvb-core/dvb_frontend.c

+6 −2
Original line number Diff line number Diff line
@@ -352,7 +352,9 @@ static int dvb_frontend_swzigzag_autotune(struct dvb_frontend *fe, int check_wra 
	if (autoinversion)

		fepriv->parameters_in.inversion = fepriv->inversion;

	if (fe->ops.set_frontend)

		fe_set_err = fe->ops.set_frontend(fe, &fepriv->parameters_in);

		fe_set_err = fe->ops.set_frontend(fe);

	else if (fe->ops.set_frontend_legacy)

		fe_set_err = fe->ops.set_frontend_legacy(fe, &fepriv->parameters_in);

	fepriv->parameters_out = fepriv->parameters_in;

	if (fe_set_err < 0) {

		fepriv->state = FESTATE_ERROR;
@@ -383,7 +385,9 @@ static void dvb_frontend_swzigzag(struct dvb_frontend *fe) 
	if (fepriv->tune_mode_flags & FE_TUNE_MODE_ONESHOT) {

		if (fepriv->state & FESTATE_RETUNE) {

			if (fe->ops.set_frontend)

				retval = fe->ops.set_frontend(fe,

				retval = fe->ops.set_frontend(fe);

			else if (fe->ops.set_frontend_legacy)

				retval = fe->ops.set_frontend_legacy(fe,

							&fepriv->parameters_in);

			fepriv->parameters_out = fepriv->parameters_in;

			if (retval < 0)

drivers/media/dvb/dvb-core/dvb_frontend.h

+2 −1
Original line number Diff line number Diff line
@@ -280,7 +280,8 @@ struct dvb_frontend_ops { 
	enum dvbfe_algo (*get_frontend_algo)(struct dvb_frontend *fe);



	/* these two are only used for the swzigzag code */

	int (*set_frontend)(struct dvb_frontend* fe, struct dvb_frontend_parameters* params);

	int (*set_frontend_legacy)(struct dvb_frontend *fe, struct dvb_frontend_parameters* params);

	int (*set_frontend)(struct dvb_frontend *fe);

	int (*get_tune_settings)(struct dvb_frontend* fe, struct dvb_frontend_tune_settings* settings);



	int (*get_frontend)(struct dvb_frontend* fe, struct dvb_frontend_parameters* params);

drivers/media/dvb/dvb-usb/af9005-fe.c

+1 −1
Original line number Diff line number Diff line
@@ -1475,7 +1475,7 @@ static struct dvb_frontend_ops af9005_fe_ops = { 
	.sleep = af9005_fe_sleep,

	.ts_bus_ctrl = af9005_ts_bus_ctrl,



	.set_frontend = af9005_fe_set_frontend,

	.set_frontend_legacy = af9005_fe_set_frontend,

	.get_frontend = af9005_fe_get_frontend,



	.read_status = af9005_fe_read_status,

drivers/media/dvb/dvb-usb/cinergyT2-fe.c

+1 −1
Original line number Diff line number Diff line
@@ -340,7 +340,7 @@ static struct dvb_frontend_ops cinergyt2_fe_ops = { 
	.init			= cinergyt2_fe_init,

	.sleep			= cinergyt2_fe_sleep,



	.set_frontend		= cinergyt2_fe_set_frontend,

	.set_frontend_legacy		= cinergyt2_fe_set_frontend,

	.get_frontend		= cinergyt2_fe_get_frontend,

	.get_tune_settings	= cinergyt2_fe_get_tune_settings,