diff options
| author | David Howells <dhowells@redhat.com> | 2015-06-03 08:35:08 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2015-06-10 11:12:25 -0300 |
| commit | c7275ae16114bd6be4cb83ee02bf801c303a2225 (patch) | |
| tree | 327ac314fcfd3672acf709d4f9d9a6b999701821 /drivers/media/dvb-frontends | |
| parent | 0f20baad24f97c3390ae869661408bb3ee12764e (diff) | |
| download | linux-c7275ae16114bd6be4cb83ee02bf801c303a2225.tar.gz | |
[media] ts2020: Allow stats polling to be suppressed
Statistics polling can not be done by lmedm04 driver's implementation of M88RS2000/TS2020 because I2C messages stop the device's demuxer, so allow polling for statistics to be suppressed in the ts2020 driver by setting dont_poll in the ts2020_config struct. Reported-by: Malcolm Priestley <tvboxspy@gmail.com> Signed-off-by: David Howells <dhowells@redhat.com> cc: Malcolm Priestley <tvboxspy@gmail.com> Signed-off-by: Antti Palosaari <crope@iki.fi> Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/media/dvb-frontends')
| -rw-r--r-- | drivers/media/dvb-frontends/ts2020.c | 18 | ||||
| -rw-r--r-- | drivers/media/dvb-frontends/ts2020.h | 3 |
2 files changed, 17 insertions, 4 deletions
diff --git a/drivers/media/dvb-frontends/ts2020.c b/drivers/media/dvb-frontends/ts2020.c index 8c997d064beb..946d8e9502fd 100644 --- a/drivers/media/dvb-frontends/ts2020.c +++ b/drivers/media/dvb-frontends/ts2020.c @@ -40,6 +40,7 @@ struct ts2020_priv { bool loop_through:1; u8 clk_out:2; u8 clk_out_div:5; + bool dont_poll:1; u32 frequency_div; /* LO output divider switch frequency */ u32 frequency_khz; /* actual used LO frequency */ #define TS2020_M88TS2020 0 @@ -52,6 +53,8 @@ struct ts2020_reg_val { u8 val; }; +static void ts2020_stat_work(struct work_struct *work); + static int ts2020_release(struct dvb_frontend *fe) { struct ts2020_priv *priv = fe->tuner_priv; @@ -79,7 +82,8 @@ static int ts2020_sleep(struct dvb_frontend *fe) return ret; /* stop statistics polling */ - cancel_delayed_work_sync(&priv->stat_work); + if (!priv->dont_poll) + cancel_delayed_work_sync(&priv->stat_work); return 0; } @@ -152,8 +156,8 @@ static int ts2020_init(struct dvb_frontend *fe) c->strength.stat[0].scale = FE_SCALE_DECIBEL; c->strength.stat[0].uvalue = 0; - /* Start statistics polling */ - schedule_delayed_work(&priv->stat_work, 0); + /* Start statistics polling by invoking the work function */ + ts2020_stat_work(&priv->stat_work.work); return 0; } @@ -445,7 +449,8 @@ static void ts2020_stat_work(struct work_struct *work) c->strength.stat[0].scale = FE_SCALE_DECIBEL; - schedule_delayed_work(&priv->stat_work, msecs_to_jiffies(2000)); + if (!priv->dont_poll) + schedule_delayed_work(&priv->stat_work, msecs_to_jiffies(2000)); return; err: dev_dbg(&client->dev, "failed=%d\n", ret); @@ -458,9 +463,13 @@ static int ts2020_read_signal_strength(struct dvb_frontend *fe, u16 *_signal_strength) { struct dtv_frontend_properties *c = &fe->dtv_property_cache; + struct ts2020_priv *priv = fe->tuner_priv; unsigned strength; __s64 gain; + if (priv->dont_poll) + ts2020_stat_work(&priv->stat_work.work); + if (c->strength.stat[0].scale == FE_SCALE_NOT_AVAILABLE) { *_signal_strength = 0; return 0; @@ -585,6 +594,7 @@ static int ts2020_probe(struct i2c_client *client, dev->loop_through = pdata->loop_through; dev->clk_out = pdata->clk_out; dev->clk_out_div = pdata->clk_out_div; + dev->dont_poll = pdata->dont_poll; dev->frequency_div = pdata->frequency_div; dev->fe = fe; dev->get_agc_pwm = pdata->get_agc_pwm; diff --git a/drivers/media/dvb-frontends/ts2020.h b/drivers/media/dvb-frontends/ts2020.h index 002bc0ac1603..9220e5cf0d21 100644 --- a/drivers/media/dvb-frontends/ts2020.h +++ b/drivers/media/dvb-frontends/ts2020.h @@ -48,6 +48,9 @@ struct ts2020_config { */ u8 clk_out_div:5; + /* Set to true to suppress stat polling */ + bool dont_poll:1; + /* * pointer to DVB frontend */ |