diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-02-03 20:18:14 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-03-21 19:32:00 -0400 |
commit | 04f590e82bdd5fa6fc36d7abf806006d27ea9e5d (patch) | |
tree | 822164ac33e6fc010a3bda5b85205794adadde5c /drivers | |
parent | 5620094a2eaa6527d7f038ad3d65ce6a76c8272a (diff) |
[media] tuner-core: remove the legacy is_stereo() call
Nobody is using this legacy call. Just remove it.
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/media/dvb/dvb-core/dvb_frontend.h | 1 | ||||
-rw-r--r-- | drivers/media/video/tuner-core.c | 10 |
2 files changed, 0 insertions, 11 deletions
diff --git a/drivers/media/dvb/dvb-core/dvb_frontend.h b/drivers/media/dvb/dvb-core/dvb_frontend.h index f9f19be77181..3b860504bf04 100644 --- a/drivers/media/dvb/dvb-core/dvb_frontend.h +++ b/drivers/media/dvb/dvb-core/dvb_frontend.h | |||
@@ -239,7 +239,6 @@ struct analog_demod_ops { | |||
239 | void (*set_params)(struct dvb_frontend *fe, | 239 | void (*set_params)(struct dvb_frontend *fe, |
240 | struct analog_parameters *params); | 240 | struct analog_parameters *params); |
241 | int (*has_signal)(struct dvb_frontend *fe); | 241 | int (*has_signal)(struct dvb_frontend *fe); |
242 | int (*is_stereo)(struct dvb_frontend *fe); | ||
243 | int (*get_afc)(struct dvb_frontend *fe); | 242 | int (*get_afc)(struct dvb_frontend *fe); |
244 | void (*tuner_status)(struct dvb_frontend *fe); | 243 | void (*tuner_status)(struct dvb_frontend *fe); |
245 | void (*standby)(struct dvb_frontend *fe); | 244 | void (*standby)(struct dvb_frontend *fe); |
diff --git a/drivers/media/video/tuner-core.c b/drivers/media/video/tuner-core.c index 6041c7d41189..912d8e87658f 100644 --- a/drivers/media/video/tuner-core.c +++ b/drivers/media/video/tuner-core.c | |||
@@ -682,9 +682,6 @@ static void tuner_status(struct dvb_frontend *fe) | |||
682 | if (analog_ops->has_signal) | 682 | if (analog_ops->has_signal) |
683 | tuner_info("Signal strength: %d\n", | 683 | tuner_info("Signal strength: %d\n", |
684 | analog_ops->has_signal(fe)); | 684 | analog_ops->has_signal(fe)); |
685 | if (analog_ops->is_stereo) | ||
686 | tuner_info("Stereo: %s\n", | ||
687 | analog_ops->is_stereo(fe) ? "yes" : "no"); | ||
688 | } | 685 | } |
689 | 686 | ||
690 | /* ---------------------------------------------------------------------- */ | 687 | /* ---------------------------------------------------------------------- */ |
@@ -861,13 +858,6 @@ static int tuner_g_tuner(struct v4l2_subdev *sd, struct v4l2_tuner *vt) | |||
861 | (tuner_status & TUNER_STATUS_STEREO) ? | 858 | (tuner_status & TUNER_STATUS_STEREO) ? |
862 | V4L2_TUNER_SUB_STEREO : | 859 | V4L2_TUNER_SUB_STEREO : |
863 | V4L2_TUNER_SUB_MONO; | 860 | V4L2_TUNER_SUB_MONO; |
864 | } else { | ||
865 | if (analog_ops->is_stereo) { | ||
866 | vt->rxsubchans = | ||
867 | analog_ops->is_stereo(&t->fe) ? | ||
868 | V4L2_TUNER_SUB_STEREO : | ||
869 | V4L2_TUNER_SUB_MONO; | ||
870 | } | ||
871 | } | 861 | } |
872 | if (analog_ops->has_signal) | 862 | if (analog_ops->has_signal) |
873 | vt->signal = analog_ops->has_signal(&t->fe); | 863 | vt->signal = analog_ops->has_signal(&t->fe); |