Skip to content

Commit

Permalink
[media] stb6100: get rid of tuner_state at struct stb6100_state
Browse files Browse the repository at this point in the history
The stb6100 driver has a struct tuner_state on its state
struct, that it is used only to store the bandwidth. Even so,
this struct is not really used, as every time the bandwidth
is get or set, it goes through the hardware.

So, get rid of that.

Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
  • Loading branch information
Mauro Carvalho Chehab committed Nov 17, 2015
1 parent 2184e25 commit cffdbfe
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 6 deletions.
9 changes: 4 additions & 5 deletions drivers/media/dvb-frontends/stb6100.c
Original file line number Diff line number Diff line change
Expand Up @@ -252,16 +252,17 @@ static int stb6100_get_bandwidth(struct dvb_frontend *fe, u32 *bandwidth)
{
int rc;
u8 f;
u32 bw;
struct stb6100_state *state = fe->tuner_priv;

rc = stb6100_read_reg(state, STB6100_F);
if (rc < 0)
return rc;
f = rc & STB6100_F_F;

state->status.bandwidth = (f + 5) * 2000; /* x2 for ZIF */
bw = (f + 5) * 2000; /* x2 for ZIF */

*bandwidth = state->bandwidth = state->status.bandwidth * 1000;
*bandwidth = state->bandwidth = bw * 1000;
dprintk(verbose, FE_DEBUG, 1, "bandwidth = %u Hz", state->bandwidth);
return 0;
}
Expand Down Expand Up @@ -495,15 +496,13 @@ static int stb6100_sleep(struct dvb_frontend *fe)
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 */

/*
* iqsense = 1
* tunerstep = 125000
*/
status->bandwidth = 36000; /* kHz */
state->bandwidth = status->bandwidth * 1000; /* Hz */
state->bandwidth = 36000000; /* Hz */
state->reference = refclk / 1000; /* kHz */

/* Set default bandwidth. Modified, PN 13-May-10 */
Expand Down
1 change: 0 additions & 1 deletion drivers/media/dvb-frontends/stb6100.h
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,6 @@ struct stb6100_state {
const struct stb6100_config *config;
struct dvb_tuner_ops ops;
struct dvb_frontend *frontend;
struct tuner_state status;

u32 frequency;
u32 srate;
Expand Down

0 comments on commit cffdbfe

Please sign in to comment.