Skip to content

Commit

Permalink
[media] dvb_frontend.h: get rid of unused tuner params/states
Browse files Browse the repository at this point in the history
There are several tuner_param values that aren't by any driver or core:
	DVBFE_TUNER_TUNERSTEP
	DVBFE_TUNER_IFFREQ
	DVBFE_TUNER_REFCLOCK
	DVBFE_TUNER_IQSENSE
	DVBFE_TUNER_DUMMY

Several of those correspond to the values at the tuner_state
struct with is also only initialized by not used anyware:
	u32 tunerstep;
	u32 ifreq;
	u32 refclock;

It doesn't make sense to keep anything at the kABI that it is
not used. So, get rid of them.

Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
  • Loading branch information
Mauro Carvalho Chehab committed Nov 17, 2015
1 parent 41c0b78 commit 2184e25
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 27 deletions.
11 changes: 1 addition & 10 deletions drivers/media/dvb-core/dvb_frontend.h
Original file line number Diff line number Diff line change
Expand Up @@ -137,12 +137,7 @@ struct analog_parameters {

enum tuner_param {
DVBFE_TUNER_FREQUENCY = (1 << 0),
DVBFE_TUNER_TUNERSTEP = (1 << 1),
DVBFE_TUNER_IFFREQ = (1 << 2),
DVBFE_TUNER_BANDWIDTH = (1 << 3),
DVBFE_TUNER_REFCLOCK = (1 << 4),
DVBFE_TUNER_IQSENSE = (1 << 5),
DVBFE_TUNER_DUMMY = (1 << 31)
DVBFE_TUNER_BANDWIDTH = (1 << 1),
};

/**
Expand Down Expand Up @@ -177,11 +172,7 @@ enum dvbfe_algo {

struct tuner_state {
u32 frequency;
u32 tunerstep;
u32 ifreq;
u32 bandwidth;
u32 iqsense;
u32 refclock;
};

/**
Expand Down
23 changes: 6 additions & 17 deletions drivers/media/dvb-frontends/stb6100.c
Original file line number Diff line number Diff line change
Expand Up @@ -496,14 +496,15 @@ static int stb6100_init(struct dvb_frontend *fe)
{
struct stb6100_state *state = fe->tuner_priv;
struct tuner_state *status = &state->status;
int refclk = 27000000; /* Hz */

status->tunerstep = 125000;
status->ifreq = 0;
status->refclock = 27000000; /* Hz */
status->iqsense = 1;
/*
* iqsense = 1
* tunerstep = 125000
*/
status->bandwidth = 36000; /* kHz */
state->bandwidth = status->bandwidth * 1000; /* Hz */
state->reference = status->refclock / 1000; /* kHz */
state->reference = refclk / 1000; /* kHz */

/* Set default bandwidth. Modified, PN 13-May-10 */
return 0;
Expand All @@ -517,15 +518,9 @@ static int stb6100_get_state(struct dvb_frontend *fe,
case DVBFE_TUNER_FREQUENCY:
stb6100_get_frequency(fe, &state->frequency);
break;
case DVBFE_TUNER_TUNERSTEP:
break;
case DVBFE_TUNER_IFFREQ:
break;
case DVBFE_TUNER_BANDWIDTH:
stb6100_get_bandwidth(fe, &state->bandwidth);
break;
case DVBFE_TUNER_REFCLOCK:
break;
default:
break;
}
Expand All @@ -544,16 +539,10 @@ static int stb6100_set_state(struct dvb_frontend *fe,
stb6100_set_frequency(fe, state->frequency);
tstate->frequency = state->frequency;
break;
case DVBFE_TUNER_TUNERSTEP:
break;
case DVBFE_TUNER_IFFREQ:
break;
case DVBFE_TUNER_BANDWIDTH:
stb6100_set_bandwidth(fe, state->bandwidth);
tstate->bandwidth = state->bandwidth;
break;
case DVBFE_TUNER_REFCLOCK:
break;
default:
break;
}
Expand Down

0 comments on commit 2184e25

Please sign in to comment.