diff options
| author | Antti Palosaari <crope@iki.fi> | 2014-12-14 11:56:08 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2015-02-03 16:08:37 -0200 |
| commit | c65dbf652da7e4d390c676c4542e1331b52f4989 (patch) | |
| tree | 1de444afdf6b258c18f554e15a129585c50d562b /drivers/media | |
| parent | 164f3d2a83311b1e6b8f67231b4cd3dc111a6fa2 (diff) | |
| download | linux-c65dbf652da7e4d390c676c4542e1331b52f4989.tar.gz linux-c65dbf652da7e4d390c676c4542e1331b52f4989.tar.bz2 linux-c65dbf652da7e4d390c676c4542e1331b52f4989.zip | |
[media] rtl2832: drop FE i2c gate control support
We don't need it anymore as all users are using muxed I2C adapter.
Signed-off-by: Antti Palosaari <crope@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/dvb-frontends/rtl2832.c | 33 | ||||
| -rw-r--r-- | drivers/media/dvb-frontends/rtl2832_priv.h | 1 |
2 files changed, 0 insertions, 34 deletions
diff --git a/drivers/media/dvb-frontends/rtl2832.c b/drivers/media/dvb-frontends/rtl2832.c index 6aaaec2a40c2..3040502c9649 100644 --- a/drivers/media/dvb-frontends/rtl2832.c +++ b/drivers/media/dvb-frontends/rtl2832.c @@ -309,30 +309,6 @@ err: } -static int rtl2832_i2c_gate_ctrl(struct dvb_frontend *fe, int enable) -{ - struct rtl2832_dev *dev = fe->demodulator_priv; - struct i2c_client *client = dev->client; - int ret; - - dev_dbg(&client->dev, "enable=%d\n", enable); - - /* gate already open or close */ - if (dev->i2c_gate_state == enable) - return 0; - - ret = rtl2832_wr_demod_reg(dev, DVBT_IIC_REPEAT, (enable ? 0x1 : 0x0)); - if (ret) - goto err; - - dev->i2c_gate_state = enable; - - return ret; -err: - dev_dbg(&client->dev, "failed=%d\n", ret); - return ret; -} - static int rtl2832_set_if(struct dvb_frontend *fe, u32 if_freq) { struct rtl2832_dev *dev = fe->demodulator_priv; @@ -932,8 +908,6 @@ static void rtl2832_i2c_gate_work(struct work_struct *work) if (ret) goto err; - dev->i2c_gate_state = false; - return; err: dev_dbg(&client->dev, "failed=%d\n", ret); @@ -949,9 +923,6 @@ static int rtl2832_select(struct i2c_adapter *adap, void *mux_priv, u32 chan_id) /* terminate possible gate closing */ cancel_delayed_work(&dev->i2c_gate_work); - if (dev->i2c_gate_state == chan_id) - return 0; - /* * chan_id 1 is muxed adapter demod provides and chan_id 0 is demod * itself. We need open gate when request is for chan_id 1. On that case @@ -965,8 +936,6 @@ static int rtl2832_select(struct i2c_adapter *adap, void *mux_priv, u32 chan_id) if (ret) goto err; - dev->i2c_gate_state = chan_id; - return 0; err: dev_dbg(&client->dev, "failed=%d\n", ret); @@ -1017,8 +986,6 @@ static struct dvb_frontend_ops rtl2832_ops = { .read_status = rtl2832_read_status, .read_snr = rtl2832_read_snr, .read_ber = rtl2832_read_ber, - - .i2c_gate_ctrl = rtl2832_i2c_gate_ctrl, }; /* diff --git a/drivers/media/dvb-frontends/rtl2832_priv.h b/drivers/media/dvb-frontends/rtl2832_priv.h index a44614c7af21..6f3fe77e8ec5 100644 --- a/drivers/media/dvb-frontends/rtl2832_priv.h +++ b/drivers/media/dvb-frontends/rtl2832_priv.h @@ -39,7 +39,6 @@ struct rtl2832_dev { u64 post_bit_error_prev; /* for old DVBv3 read_ber() calculation */ u64 post_bit_error; u64 post_bit_count; - bool i2c_gate_state; bool sleeping; struct delayed_work i2c_gate_work; }; |