UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

[media] cx24120: Remove additional calls to read_status 

get_frontend was making a call to read_status, which is being
called periodically anyway. Have read_status store fe_status in
the state struct instead and use that within get_frontend.

Signed-off-by: Jemma Denson <jdenson@gmail.com>
Signed-off-by: Patrick Boettcher <patrick.boettcher@posteo.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
This commit is contained in:
Jemma Denson 2015-05-05 17:18:11 -03:00 committed by Mauro Carvalho Chehab
parent d3cf06bbe3
commit 1462612cb3
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/media/dvb-frontends/cx24120.c
View File

@ -143,6 +143,8 @@ struct cx24120_state {
/* current and next tuning parameters */
struct cx24120_tuning dcur;
struct cx24120_tuning dnxt;
fe_status_t fe_status;
};
/* Command message to firmware */
@ -615,7 +617,7 @@ static int cx24120_send_diseqc_msg(struct dvb_frontend *fe,
return -ETIMEDOUT;
}
static void cx24120_get_stats(struct cx24120_state *state, fe_status_t status)
static void cx24120_get_stats(struct cx24120_state *state)
{
struct dvb_frontend *fe = &state->frontend;
struct dtv_frontend_properties *c = &fe->dtv_property_cache;
@ -625,7 +627,7 @@ static void cx24120_get_stats(struct cx24120_state *state, fe_status_t status)
dev_dbg(&state->i2c->dev, "%s()\n", __func__);
/* signal strength */
if (status & FE_HAS_SIGNAL) {
if (state->fe_status & FE_HAS_SIGNAL) {
ret = cx24120_read_signal_strength(fe, &u16tmp);
if (ret != 0)
return;
@ -669,7 +671,8 @@ static int cx24120_read_status(struct dvb_frontend *fe, fe_status_t *status)
* Other cx241xx drivers have this slightly
* different */
cx24120_get_stats(state, *status);
state->fe_status = *status;
cx24120_get_stats(state);
/* Set the clock once tuned in */
if (state->need_clock_set && *status & FE_HAS_LOCK) {
@ -1405,13 +1408,11 @@ static int cx24120_get_frontend(struct dvb_frontend *fe)
struct dtv_frontend_properties *c = &fe->dtv_property_cache;
struct cx24120_state *state = fe->demodulator_priv;
u8 freq1, freq2, freq3;
fe_status_t status;
dev_dbg(&state->i2c->dev, "%s()", __func__);
/* don't return empty data if we're not tuned in */
cx24120_read_status(fe, &status);
if ((status & FE_HAS_LOCK) == 0)
if ((state->fe_status & FE_HAS_LOCK) == 0)
return 0;
/* Get frequency */