From 965a3a0bf3c198e99611914852632525f1e9f43d Mon Sep 17 00:00:00 2001 From: Michael Krufky Date: Sat, 28 Feb 2009 19:34:25 -0300 Subject: [PATCH] --- yaml --- r: 138020 b: refs/heads/master c: b1ff363bfe279c41bd4e43886d47c810459a244e h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/common/tuners/mxl5007t.c | 29 -------------------- 2 files changed, 1 insertion(+), 30 deletions(-) diff --git a/[refs] b/[refs] index a76e18f311b5..016832d022e4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 69e233332432551e10d64492e60d84fee7657bb6 +refs/heads/master: b1ff363bfe279c41bd4e43886d47c810459a244e diff --git a/trunk/drivers/media/common/tuners/mxl5007t.c b/trunk/drivers/media/common/tuners/mxl5007t.c index cbcb19b6e09d..e2a2cf2d31fc 100644 --- a/trunk/drivers/media/common/tuners/mxl5007t.c +++ b/trunk/drivers/media/common/tuners/mxl5007t.c @@ -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) @@ -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);