Skip to content

Commit

Permalink
[media] dvb: remove the track() fops
Browse files Browse the repository at this point in the history
This callback is not used anywhere. Maybe it were used in the
past to optimize the custom algo, but, as it is not used anymore,
let's just remove it.

If later needed, some patch may re-add it with a proper
implementation.

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  • Loading branch information
Mauro Carvalho Chehab committed Dec 31, 2011
1 parent 41da532 commit 1b5d871
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 33 deletions.
5 changes: 1 addition & 4 deletions drivers/media/dvb/dvb-core/dvb_frontend.c
Original file line number Diff line number Diff line change
Expand Up @@ -637,10 +637,7 @@ static int dvb_frontend_thread(void *data)
}
}
/* Track the carrier if the search was successful */
if (fepriv->algo_status == DVBFE_ALGO_SEARCH_SUCCESS) {
if (fe->ops.track)
fe->ops.track(fe, &fepriv->parameters_in);
} else {
if (fepriv->algo_status != DVBFE_ALGO_SEARCH_SUCCESS) {
fepriv->algo_status |= DVBFE_ALGO_SEARCH_AGAIN;
fepriv->delay = HZ / 2;
}
Expand Down
1 change: 0 additions & 1 deletion drivers/media/dvb/dvb-core/dvb_frontend.h
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,6 @@ struct dvb_frontend_ops {
* tuning algorithms, rather than a simple swzigzag
*/
enum dvbfe_search (*search)(struct dvb_frontend *fe);
int (*track)(struct dvb_frontend *fe, struct dvb_frontend_parameters *p);

struct dvb_tuner_ops tuner_ops;
struct analog_demod_ops analog_ops;
Expand Down
21 changes: 0 additions & 21 deletions drivers/media/dvb/frontends/stb0899_drv.c
Original file line number Diff line number Diff line change
Expand Up @@ -1568,26 +1568,6 @@ static enum dvbfe_search stb0899_search(struct dvb_frontend *fe)

return DVBFE_ALGO_SEARCH_ERROR;
}
/*
* stb0899_track
* periodically check the signal level against a specified
* threshold level and perform derotator centering.
* called once we have a lock from a successful search
* event.
*
* Will be called periodically called to maintain the
* lock.
*
* Will be used to get parameters as well as info from
* the decoded baseband header
*
* Once a new lock has established, the internal state
* frequency (internal->freq) is updated
*/
static int stb0899_track(struct dvb_frontend *fe, struct dvb_frontend_parameters *p)
{
return 0;
}

static int stb0899_get_frontend(struct dvb_frontend *fe, struct dtv_frontend_properties *p)
{
Expand Down Expand Up @@ -1647,7 +1627,6 @@ static struct dvb_frontend_ops stb0899_ops = {

.get_frontend_algo = stb0899_frontend_algo,
.search = stb0899_search,
.track = stb0899_track,
.get_frontend = stb0899_get_frontend,


Expand Down
7 changes: 0 additions & 7 deletions drivers/media/dvb/frontends/stv0900_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -1658,12 +1658,6 @@ static int stv0900_read_status(struct dvb_frontend *fe, enum fe_status *status)
return 0;
}

static int stv0900_track(struct dvb_frontend *fe,
struct dvb_frontend_parameters *p)
{
return 0;
}

static int stv0900_stop_ts(struct dvb_frontend *fe, int stop_ts)
{

Expand Down Expand Up @@ -1891,7 +1885,6 @@ static struct dvb_frontend_ops stv0900_ops = {
.diseqc_recv_slave_reply = stv0900_recv_slave_reply,
.set_tone = stv0900_set_tone,
.search = stv0900_search,
.track = stv0900_track,
.read_status = stv0900_read_status,
.read_ber = stv0900_read_ber,
.read_signal_strength = stv0900_read_signal_strength,
Expand Down

0 comments on commit 1b5d871

Please sign in to comment.