Skip to content

Commit

Permalink
[media] rtl2832: drop FE i2c gate control support
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Antti Palosaari authored and Mauro Carvalho Chehab committed Feb 3, 2015
1 parent 164f3d2 commit c65dbf6
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 34 deletions.
33 changes: 0 additions & 33 deletions drivers/media/dvb-frontends/rtl2832.c
Original file line number Diff line number Diff line change
Expand Up @@ -309,30 +309,6 @@ static int rtl2832_wr_demod_reg(struct rtl2832_dev *dev, int reg, u32 val)

}

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;
Expand Down Expand Up @@ -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);
Expand All @@ -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
Expand All @@ -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);
Expand Down Expand Up @@ -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,
};

/*
Expand Down
1 change: 0 additions & 1 deletion drivers/media/dvb-frontends/rtl2832_priv.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
};
Expand Down

0 comments on commit c65dbf6

Please sign in to comment.