Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 285453
b: refs/heads/master
c: 2676c25
h: refs/heads/master
i:
  285451: 66af38e
v: v3
  • Loading branch information
Mauro Carvalho Chehab committed Dec 31, 2011
1 parent 508c5ae commit 929ce8e
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 12 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 8b80ff3ad52690d37e9617335ce9d66e6d4a92e5
refs/heads/master: 2676c258eb836caed508099e58030398217a5ef0
12 changes: 2 additions & 10 deletions trunk/drivers/media/common/tuners/mt2060.c
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,7 @@ static int mt2060_spurcheck(u32 lo1,u32 lo2,u32 if2)

static int mt2060_set_params(struct dvb_frontend *fe, struct dvb_frontend_parameters *params)
{
struct dtv_frontend_properties *c = &fe->dtv_property_cache;
struct mt2060_priv *priv;
int ret=0;
int i=0;
Expand All @@ -176,8 +177,7 @@ static int mt2060_set_params(struct dvb_frontend *fe, struct dvb_frontend_parame

mt2060_writeregs(priv,b,2);

freq = params->frequency / 1000; // Hz -> kHz
priv->bandwidth = (fe->ops.info.type == FE_OFDM) ? params->u.ofdm.bandwidth : 0;
freq = c->frequency / 1000; /* Hz -> kHz */

f_lo1 = freq + if1 * 1000;
f_lo1 = (f_lo1 / 250) * 250;
Expand Down Expand Up @@ -293,13 +293,6 @@ static int mt2060_get_frequency(struct dvb_frontend *fe, u32 *frequency)
return 0;
}

static int mt2060_get_bandwidth(struct dvb_frontend *fe, u32 *bandwidth)
{
struct mt2060_priv *priv = fe->tuner_priv;
*bandwidth = priv->bandwidth;
return 0;
}

static int mt2060_get_if_frequency(struct dvb_frontend *fe, u32 *frequency)
{
*frequency = IF2 * 1000;
Expand Down Expand Up @@ -362,7 +355,6 @@ static const struct dvb_tuner_ops mt2060_tuner_ops = {

.set_params = mt2060_set_params,
.get_frequency = mt2060_get_frequency,
.get_bandwidth = mt2060_get_bandwidth,
.get_if_frequency = mt2060_get_if_frequency,
};

Expand Down
1 change: 0 additions & 1 deletion trunk/drivers/media/common/tuners/mt2060_priv.h
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,6 @@ struct mt2060_priv {
struct i2c_adapter *i2c;

u32 frequency;
u32 bandwidth;
u16 if1_freq;
u8 fmfreq;
};
Expand Down

0 comments on commit 929ce8e

Please sign in to comment.