Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 138020
b: refs/heads/master
c: b1ff363
h: refs/heads/master
v: v3
  • Loading branch information
Michael Krufky authored and Mauro Carvalho Chehab committed Mar 30, 2009
1 parent 68816eb commit 965a3a0
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 30 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: 69e233332432551e10d64492e60d84fee7657bb6
refs/heads/master: b1ff363bfe279c41bd4e43886d47c810459a244e
29 changes: 0 additions & 29 deletions trunk/drivers/media/common/tuners/mxl5007t.c
Original file line number Diff line number Diff line change
Expand Up @@ -577,36 +577,12 @@ static int mxl5007t_synth_lock_status(struct mxl5007t_state *state,
return ret;
}

static int mxl5007t_check_rf_input_power(struct mxl5007t_state *state,
s32 *rf_input_level)
{
u8 d1, d2;
int ret;

ret = mxl5007t_read_reg(state, 0xb7, &d1);
if (mxl_fail(ret))
goto fail;

ret = mxl5007t_read_reg(state, 0xbf, &d2);
if (mxl_fail(ret))
goto fail;

d2 = d2 >> 4;
if (d2 > 7)
d2 += 0xf0;

*rf_input_level = (s32)(d1 + d2 - 113);
fail:
return ret;
}

/* ------------------------------------------------------------------------- */

static int mxl5007t_get_status(struct dvb_frontend *fe, u32 *status)
{
struct mxl5007t_state *state = fe->tuner_priv;
int rf_locked, ref_locked;
s32 rf_input_level = 0;
int ret;

if (fe->ops.i2c_gate_ctrl)
Expand All @@ -617,11 +593,6 @@ static int mxl5007t_get_status(struct dvb_frontend *fe, u32 *status)
goto fail;
mxl_debug("%s%s", rf_locked ? "rf locked " : "",
ref_locked ? "ref locked" : "");

ret = mxl5007t_check_rf_input_power(state, &rf_input_level);
if (mxl_fail(ret))
goto fail;
mxl_debug("rf input power: %d", rf_input_level);
fail:
if (fe->ops.i2c_gate_ctrl)
fe->ops.i2c_gate_ctrl(fe, 0);
Expand Down

0 comments on commit 965a3a0

Please sign in to comment.