evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[media] e4000: rename some variables

Browse source 
Rename some variables.
Change error status checks from (ret < 0) to (ret).
No actual functionality changes.

Signed-off-by: Antti Palosaari <crope@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
This commit is contained in:
Antti Palosaari 2014-02-10 22:52:51 -03:00 • committed by Mauro Carvalho Chehab
parent bd428bbc75
commit c5f51b1582
2 changed files with 167 additions and 167 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

332
drivers/media/tuners/e4000.c
View file

@ -23,110 +23,110 @@
static int e4000_init(struct dvb_frontend *fe) static int e4000_init(struct dvb_frontend *fe)
{ {
struct e4000_priv *priv = fe->tuner_priv; struct e4000 *s = fe->tuner_priv;
int ret; int ret;
dev_dbg(&priv->client->dev, "%s:\n", __func__); dev_dbg(&s->client->dev, "%s:\n", __func__);
/* dummy I2C to ensure I2C wakes up */ /* dummy I2C to ensure I2C wakes up */
ret = regmap_write(priv->regmap, 0x02, 0x40); ret = regmap_write(s->regmap, 0x02, 0x40);
/* reset */ /* reset */
ret = regmap_write(priv->regmap, 0x00, 0x01); ret = regmap_write(s->regmap, 0x00, 0x01);
if (ret < 0) if (ret)
goto err; goto err;
/* disable output clock */ /* disable output clock */
ret = regmap_write(priv->regmap, 0x06, 0x00); ret = regmap_write(s->regmap, 0x06, 0x00);
if (ret < 0) if (ret)
goto err; goto err;
ret = regmap_write(priv->regmap, 0x7a, 0x96); ret = regmap_write(s->regmap, 0x7a, 0x96);
if (ret < 0) if (ret)
goto err; goto err;
/* configure gains */ /* configure gains */
ret = regmap_bulk_write(priv->regmap, 0x7e, "\x01\xfe", 2); ret = regmap_bulk_write(s->regmap, 0x7e, "\x01\xfe", 2);
if (ret < 0) if (ret)
goto err; goto err;
ret = regmap_write(priv->regmap, 0x82, 0x00); ret = regmap_write(s->regmap, 0x82, 0x00);
if (ret < 0) if (ret)
goto err; goto err;
ret = regmap_write(priv->regmap, 0x24, 0x05); ret = regmap_write(s->regmap, 0x24, 0x05);
if (ret < 0) if (ret)
goto err; goto err;
ret = regmap_bulk_write(priv->regmap, 0x87, "\x20\x01", 2); ret = regmap_bulk_write(s->regmap, 0x87, "\x20\x01", 2);
if (ret < 0) if (ret)
goto err; goto err;
ret = regmap_bulk_write(priv->regmap, 0x9f, "\x7f\x07", 2); ret = regmap_bulk_write(s->regmap, 0x9f, "\x7f\x07", 2);
if (ret < 0) if (ret)
goto err; goto err;
/* DC offset control */ /* DC offset control */
ret = regmap_write(priv->regmap, 0x2d, 0x1f); ret = regmap_write(s->regmap, 0x2d, 0x1f);
if (ret < 0) if (ret)
goto err; goto err;
ret = regmap_bulk_write(priv->regmap, 0x70, "\x01\x01", 2); ret = regmap_bulk_write(s->regmap, 0x70, "\x01\x01", 2);
if (ret < 0) if (ret)
goto err; goto err;
/* gain control */ /* gain control */
ret = regmap_write(priv->regmap, 0x1a, 0x17); ret = regmap_write(s->regmap, 0x1a, 0x17);
if (ret < 0) if (ret)
goto err; goto err;
ret = regmap_write(priv->regmap, 0x1f, 0x1a); ret = regmap_write(s->regmap, 0x1f, 0x1a);
if (ret < 0) if (ret)
goto err; goto err;
priv->active = true; s->active = true;
err: err:
if (ret) if (ret)
dev_dbg(&priv->client->dev, "%s: failed=%d\n", __func__, ret); dev_dbg(&s->client->dev, "%s: failed=%d\n", __func__, ret);
return ret; return ret;
} }
static int e4000_sleep(struct dvb_frontend *fe) static int e4000_sleep(struct dvb_frontend *fe)
{ {
struct e4000_priv *priv = fe->tuner_priv; struct e4000 *s = fe->tuner_priv;
int ret; int ret;
dev_dbg(&priv->client->dev, "%s:\n", __func__); dev_dbg(&s->client->dev, "%s:\n", __func__);
priv->active = false; s->active = false;
ret = regmap_write(priv->regmap, 0x00, 0x00); ret = regmap_write(s->regmap, 0x00, 0x00);
if (ret < 0) if (ret)
goto err; goto err;
err: err:
if (ret) if (ret)
dev_dbg(&priv->client->dev, "%s: failed=%d\n", __func__, ret); dev_dbg(&s->client->dev, "%s: failed=%d\n", __func__, ret);
return ret; return ret;
} }
static int e4000_set_params(struct dvb_frontend *fe) static int e4000_set_params(struct dvb_frontend *fe)
{ {
struct e4000_priv *priv = fe->tuner_priv; struct e4000 *s = fe->tuner_priv;
struct dtv_frontend_properties *c = &fe->dtv_property_cache; struct dtv_frontend_properties *c = &fe->dtv_property_cache;
int ret, i, sigma_delta; int ret, i, sigma_delta;
u64 f_vco; u64 f_vco;
u8 buf[5], i_data[4], q_data[4]; u8 buf[5], i_data[4], q_data[4];
dev_dbg(&priv->client->dev, dev_dbg(&s->client->dev,
"%s: delivery_system=%d frequency=%u bandwidth_hz=%u\n", "%s: delivery_system=%d frequency=%u bandwidth_hz=%u\n",
__func__, c->delivery_system, c->frequency, __func__, c->delivery_system, c->frequency,
c->bandwidth_hz); c->bandwidth_hz);
/* gain control manual */ /* gain control manual */
ret = regmap_write(priv->regmap, 0x1a, 0x00); ret = regmap_write(s->regmap, 0x1a, 0x00);
if (ret < 0) if (ret)
goto err; goto err;
/* PLL */ /* PLL */
@ -141,19 +141,19 @@ static int e4000_set_params(struct dvb_frontend *fe)
} }
f_vco = 1ull * c->frequency * e4000_pll_lut[i].mul; f_vco = 1ull * c->frequency * e4000_pll_lut[i].mul;
sigma_delta = div_u64(0x10000ULL * (f_vco % priv->clock), priv->clock); sigma_delta = div_u64(0x10000ULL * (f_vco % s->clock), s->clock);
buf[0] = div_u64(f_vco, priv->clock); buf[0] = div_u64(f_vco, s->clock);
buf[1] = (sigma_delta >> 0) & 0xff; buf[1] = (sigma_delta >> 0) & 0xff;
buf[2] = (sigma_delta >> 8) & 0xff; buf[2] = (sigma_delta >> 8) & 0xff;
buf[3] = 0x00; buf[3] = 0x00;
buf[4] = e4000_pll_lut[i].div; buf[4] = e4000_pll_lut[i].div;
dev_dbg(&priv->client->dev, dev_dbg(&s->client->dev,
"%s: f_vco=%llu pll div=%d sigma_delta=%04x\n", "%s: f_vco=%llu pll div=%d sigma_delta=%04x\n",
__func__, f_vco, buf[0], sigma_delta); __func__, f_vco, buf[0], sigma_delta);
ret = regmap_bulk_write(priv->regmap, 0x09, buf, 5); ret = regmap_bulk_write(s->regmap, 0x09, buf, 5);
if (ret < 0) if (ret)
goto err; goto err;
/* LNA filter (RF filter) */ /* LNA filter (RF filter) */
@ -167,8 +167,8 @@ static int e4000_set_params(struct dvb_frontend *fe)
goto err; goto err;
} }
ret = regmap_write(priv->regmap, 0x10, e400_lna_filter_lut[i].val); ret = regmap_write(s->regmap, 0x10, e400_lna_filter_lut[i].val);
if (ret < 0) if (ret)
goto err; goto err;
/* IF filters */ /* IF filters */
@ -185,8 +185,8 @@ static int e4000_set_params(struct dvb_frontend *fe)
buf[0] = e4000_if_filter_lut[i].reg11_val; buf[0] = e4000_if_filter_lut[i].reg11_val;
buf[1] = e4000_if_filter_lut[i].reg12_val; buf[1] = e4000_if_filter_lut[i].reg12_val;
ret = regmap_bulk_write(priv->regmap, 0x11, buf, 2); ret = regmap_bulk_write(s->regmap, 0x11, buf, 2);
if (ret < 0) if (ret)
goto err; goto err;
/* frequency band */ /* frequency band */
@ -200,34 +200,34 @@ static int e4000_set_params(struct dvb_frontend *fe)
goto err; goto err;
} }
ret = regmap_write(priv->regmap, 0x07, e4000_band_lut[i].reg07_val); ret = regmap_write(s->regmap, 0x07, e4000_band_lut[i].reg07_val);
if (ret < 0) if (ret)
goto err; goto err;
ret = regmap_write(priv->regmap, 0x78, e4000_band_lut[i].reg78_val); ret = regmap_write(s->regmap, 0x78, e4000_band_lut[i].reg78_val);
if (ret < 0) if (ret)
goto err; goto err;
/* DC offset */ /* DC offset */
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
if (i == 0) if (i == 0)
ret = regmap_bulk_write(priv->regmap, 0x15, "\x00\x7e\x24", 3); ret = regmap_bulk_write(s->regmap, 0x15, "\x00\x7e\x24", 3);
else if (i == 1) else if (i == 1)
ret = regmap_bulk_write(priv->regmap, 0x15, "\x00\x7f", 2); ret = regmap_bulk_write(s->regmap, 0x15, "\x00\x7f", 2);
else if (i == 2) else if (i == 2)
ret = regmap_bulk_write(priv->regmap, 0x15, "\x01", 1); ret = regmap_bulk_write(s->regmap, 0x15, "\x01", 1);
else else
ret = regmap_bulk_write(priv->regmap, 0x16, "\x7e", 1); ret = regmap_bulk_write(s->regmap, 0x16, "\x7e", 1);
if (ret < 0) if (ret)
goto err; goto err;
ret = regmap_write(priv->regmap, 0x29, 0x01); ret = regmap_write(s->regmap, 0x29, 0x01);
if (ret < 0) if (ret)
goto err; goto err;
ret = regmap_bulk_read(priv->regmap, 0x2a, buf, 3); ret = regmap_bulk_read(s->regmap, 0x2a, buf, 3);
if (ret < 0) if (ret)
goto err; goto err;
i_data[i] = (((buf[2] >> 0) & 0x3) << 6) | (buf[0] & 0x3f); i_data[i] = (((buf[2] >> 0) & 0x3) << 6) | (buf[0] & 0x3f);
@ -237,30 +237,30 @@ static int e4000_set_params(struct dvb_frontend *fe)
swap(q_data[2], q_data[3]); swap(q_data[2], q_data[3]);
swap(i_data[2], i_data[3]); swap(i_data[2], i_data[3]);
ret = regmap_bulk_write(priv->regmap, 0x50, q_data, 4); ret = regmap_bulk_write(s->regmap, 0x50, q_data, 4);
if (ret < 0) if (ret)
goto err; goto err;
ret = regmap_bulk_write(priv->regmap, 0x60, i_data, 4); ret = regmap_bulk_write(s->regmap, 0x60, i_data, 4);
if (ret < 0) if (ret)
goto err; goto err;
/* gain control auto */ /* gain control auto */
ret = regmap_write(priv->regmap, 0x1a, 0x17); ret = regmap_write(s->regmap, 0x1a, 0x17);
if (ret < 0) if (ret)
goto err; goto err;
err: err:
if (ret) if (ret)
dev_dbg(&priv->client->dev, "%s: failed=%d\n", __func__, ret); dev_dbg(&s->client->dev, "%s: failed=%d\n", __func__, ret);
return ret; return ret;
} }
static int e4000_get_if_frequency(struct dvb_frontend *fe, u32 *frequency) static int e4000_get_if_frequency(struct dvb_frontend *fe, u32 *frequency)
{ {
struct e4000_priv *priv = fe->tuner_priv; struct e4000 *s = fe->tuner_priv;
dev_dbg(&priv->client->dev, "%s:\n", __func__); dev_dbg(&s->client->dev, "%s:\n", __func__);
*frequency = 0; /* Zero-IF */ *frequency = 0; /* Zero-IF */
@ -269,143 +269,143 @@ static int e4000_get_if_frequency(struct dvb_frontend *fe, u32 *frequency)
static int e4000_set_lna_gain(struct dvb_frontend *fe) static int e4000_set_lna_gain(struct dvb_frontend *fe)
{ {
struct e4000_priv *priv = fe->tuner_priv; struct e4000 *s = fe->tuner_priv;
int ret; int ret;
u8 u8tmp; u8 u8tmp;
dev_dbg(&priv->client->dev, "%s: lna auto=%d->%d val=%d->%d\n", dev_dbg(&s->client->dev, "%s: lna auto=%d->%d val=%d->%d\n",
__func__, priv->lna_gain_auto->cur.val, __func__, s->lna_gain_auto->cur.val,
priv->lna_gain_auto->val, priv->lna_gain->cur.val, s->lna_gain_auto->val, s->lna_gain->cur.val,
priv->lna_gain->val); s->lna_gain->val);
if (priv->lna_gain_auto->val && priv->if_gain_auto->cur.val) if (s->lna_gain_auto->val && s->if_gain_auto->cur.val)
u8tmp = 0x17; u8tmp = 0x17;
else if (priv->lna_gain_auto->val) else if (s->lna_gain_auto->val)
u8tmp = 0x19; u8tmp = 0x19;
else if (priv->if_gain_auto->cur.val) else if (s->if_gain_auto->cur.val)
u8tmp = 0x16; u8tmp = 0x16;
else else
u8tmp = 0x10; u8tmp = 0x10;
ret = regmap_write(priv->regmap, 0x1a, u8tmp); ret = regmap_write(s->regmap, 0x1a, u8tmp);
if (ret) if (ret)
goto err; goto err;
if (priv->lna_gain_auto->val == false) { if (s->lna_gain_auto->val == false) {
ret = regmap_write(priv->regmap, 0x14, priv->lna_gain->val); ret = regmap_write(s->regmap, 0x14, s->lna_gain->val);
if (ret) if (ret)
goto err; goto err;
} }
err: err:
if (ret) if (ret)
dev_dbg(&priv->client->dev, "%s: failed=%d\n", __func__, ret); dev_dbg(&s->client->dev, "%s: failed=%d\n", __func__, ret);
return ret; return ret;
} }
static int e4000_set_mixer_gain(struct dvb_frontend *fe) static int e4000_set_mixer_gain(struct dvb_frontend *fe)
{ {
struct e4000_priv *priv = fe->tuner_priv; struct e4000 *s = fe->tuner_priv;
int ret; int ret;
u8 u8tmp; u8 u8tmp;
dev_dbg(&priv->client->dev, "%s: mixer auto=%d->%d val=%d->%d\n", dev_dbg(&s->client->dev, "%s: mixer auto=%d->%d val=%d->%d\n",
__func__, priv->mixer_gain_auto->cur.val, __func__, s->mixer_gain_auto->cur.val,
priv->mixer_gain_auto->val, priv->mixer_gain->cur.val, s->mixer_gain_auto->val, s->mixer_gain->cur.val,
priv->mixer_gain->val); s->mixer_gain->val);
if (priv->mixer_gain_auto->val) if (s->mixer_gain_auto->val)
u8tmp = 0x15; u8tmp = 0x15;
else else
u8tmp = 0x14; u8tmp = 0x14;
ret = regmap_write(priv->regmap, 0x20, u8tmp); ret = regmap_write(s->regmap, 0x20, u8tmp);
if (ret) if (ret)
goto err; goto err;
if (priv->mixer_gain_auto->val == false) { if (s->mixer_gain_auto->val == false) {
ret = regmap_write(priv->regmap, 0x15, priv->mixer_gain->val); ret = regmap_write(s->regmap, 0x15, s->mixer_gain->val);
if (ret) if (ret)
goto err; goto err;
} }
err: err:
if (ret) if (ret)
dev_dbg(&priv->client->dev, "%s: failed=%d\n", __func__, ret); dev_dbg(&s->client->dev, "%s: failed=%d\n", __func__, ret);
return ret; return ret;
} }
static int e4000_set_if_gain(struct dvb_frontend *fe) static int e4000_set_if_gain(struct dvb_frontend *fe)
{ {
struct e4000_priv *priv = fe->tuner_priv; struct e4000 *s = fe->tuner_priv;
int ret; int ret;
u8 buf[2]; u8 buf[2];
u8 u8tmp; u8 u8tmp;
dev_dbg(&priv->client->dev, "%s: if auto=%d->%d val=%d->%d\n", dev_dbg(&s->client->dev, "%s: if auto=%d->%d val=%d->%d\n",
__func__, priv->if_gain_auto->cur.val, __func__, s->if_gain_auto->cur.val,
priv->if_gain_auto->val, priv->if_gain->cur.val, s->if_gain_auto->val, s->if_gain->cur.val,
priv->if_gain->val); s->if_gain->val);
if (priv->if_gain_auto->val && priv->lna_gain_auto->cur.val) if (s->if_gain_auto->val && s->lna_gain_auto->cur.val)
u8tmp = 0x17; u8tmp = 0x17;
else if (priv->lna_gain_auto->cur.val) else if (s->lna_gain_auto->cur.val)
u8tmp = 0x19; u8tmp = 0x19;
else if (priv->if_gain_auto->val) else if (s->if_gain_auto->val)
u8tmp = 0x16; u8tmp = 0x16;
else else
u8tmp = 0x10; u8tmp = 0x10;
ret = regmap_write(priv->regmap, 0x1a, u8tmp); ret = regmap_write(s->regmap, 0x1a, u8tmp);
if (ret) if (ret)
goto err; goto err;
if (priv->if_gain_auto->val == false) { if (s->if_gain_auto->val == false) {
buf[0] = e4000_if_gain_lut[priv->if_gain->val].reg16_val; buf[0] = e4000_if_gain_lut[s->if_gain->val].reg16_val;
buf[1] = e4000_if_gain_lut[priv->if_gain->val].reg17_val; buf[1] = e4000_if_gain_lut[s->if_gain->val].reg17_val;
ret = regmap_bulk_write(priv->regmap, 0x16, buf, 2); ret = regmap_bulk_write(s->regmap, 0x16, buf, 2);
if (ret) if (ret)
goto err; goto err;
} }
err: err:
if (ret) if (ret)
dev_dbg(&priv->client->dev, "%s: failed=%d\n", __func__, ret); dev_dbg(&s->client->dev, "%s: failed=%d\n", __func__, ret);
return ret; return ret;
} }
static int e4000_pll_lock(struct dvb_frontend *fe) static int e4000_pll_lock(struct dvb_frontend *fe)
{ {
struct e4000_priv *priv = fe->tuner_priv; struct e4000 *s = fe->tuner_priv;
int ret; int ret;
unsigned int utmp; unsigned int utmp;
ret = regmap_read(priv->regmap, 0x07, &utmp); ret = regmap_read(s->regmap, 0x07, &utmp);
if (ret < 0) if (ret)
goto err; goto err;
priv->pll_lock->val = (utmp & 0x01); s->pll_lock->val = (utmp & 0x01);
err: err:
if (ret) if (ret)
dev_dbg(&priv->client->dev, "%s: failed=%d\n", __func__, ret); dev_dbg(&s->client->dev, "%s: failed=%d\n", __func__, ret);
return ret; return ret;
} }
static int e4000_g_volatile_ctrl(struct v4l2_ctrl *ctrl) static int e4000_g_volatile_ctrl(struct v4l2_ctrl *ctrl)
{ {
struct e4000_priv *priv = container_of(ctrl->handler, struct e4000_priv, hdl); struct e4000 *s = container_of(ctrl->handler, struct e4000, hdl);
int ret; int ret;
if (priv->active == false) if (s->active == false)
return 0; return 0;
switch (ctrl->id) { switch (ctrl->id) {
case V4L2_CID_RF_TUNER_PLL_LOCK: case V4L2_CID_RF_TUNER_PLL_LOCK:
ret = e4000_pll_lock(priv->fe); ret = e4000_pll_lock(s->fe);
break; break;
default: default:
dev_dbg(&priv->client->dev, "%s: unknown ctrl: id=%d name=%s\n", dev_dbg(&s->client->dev, "%s: unknown ctrl: id=%d name=%s\n",
__func__, ctrl->id, ctrl->name); __func__, ctrl->id, ctrl->name);
ret = -EINVAL; ret = -EINVAL;
} }
@ -415,34 +415,34 @@ static int e4000_g_volatile_ctrl(struct v4l2_ctrl *ctrl)
static int e4000_s_ctrl(struct v4l2_ctrl *ctrl) static int e4000_s_ctrl(struct v4l2_ctrl *ctrl)
{ {
struct e4000_priv *priv = container_of(ctrl->handler, struct e4000_priv, hdl); struct e4000 *s = container_of(ctrl->handler, struct e4000, hdl);
struct dvb_frontend *fe = priv->fe; struct dvb_frontend *fe = s->fe;
struct dtv_frontend_properties *c = &fe->dtv_property_cache; struct dtv_frontend_properties *c = &fe->dtv_property_cache;
int ret; int ret;
if (priv->active == false) if (s->active == false)
return 0; return 0;
switch (ctrl->id) { switch (ctrl->id) {
case V4L2_CID_RF_TUNER_BANDWIDTH_AUTO: case V4L2_CID_RF_TUNER_BANDWIDTH_AUTO:
case V4L2_CID_RF_TUNER_BANDWIDTH: case V4L2_CID_RF_TUNER_BANDWIDTH:
c->bandwidth_hz = priv->bandwidth->val; c->bandwidth_hz = s->bandwidth->val;
ret = e4000_set_params(priv->fe); ret = e4000_set_params(s->fe);
break; break;
case V4L2_CID_RF_TUNER_LNA_GAIN_AUTO: case V4L2_CID_RF_TUNER_LNA_GAIN_AUTO:
case V4L2_CID_RF_TUNER_LNA_GAIN: case V4L2_CID_RF_TUNER_LNA_GAIN:
ret = e4000_set_lna_gain(priv->fe); ret = e4000_set_lna_gain(s->fe);
break; break;
case V4L2_CID_RF_TUNER_MIXER_GAIN_AUTO: case V4L2_CID_RF_TUNER_MIXER_GAIN_AUTO:
case V4L2_CID_RF_TUNER_MIXER_GAIN: case V4L2_CID_RF_TUNER_MIXER_GAIN:
ret = e4000_set_mixer_gain(priv->fe); ret = e4000_set_mixer_gain(s->fe);
break; break;
case V4L2_CID_RF_TUNER_IF_GAIN_AUTO: case V4L2_CID_RF_TUNER_IF_GAIN_AUTO:
case V4L2_CID_RF_TUNER_IF_GAIN: case V4L2_CID_RF_TUNER_IF_GAIN:
ret = e4000_set_if_gain(priv->fe); ret = e4000_set_if_gain(s->fe);
break; break;
default: default:
dev_dbg(&priv->client->dev, "%s: unknown ctrl: id=%d name=%s\n", dev_dbg(&s->client->dev, "%s: unknown ctrl: id=%d name=%s\n",
__func__, ctrl->id, ctrl->name); __func__, ctrl->id, ctrl->name);
ret = -EINVAL; ret = -EINVAL;
} }
@ -478,7 +478,7 @@ static int e4000_probe(struct i2c_client *client,
{ {
struct e4000_config *cfg = client->dev.platform_data; struct e4000_config *cfg = client->dev.platform_data;
struct dvb_frontend *fe = cfg->fe; struct dvb_frontend *fe = cfg->fe;
struct e4000_priv *priv; struct e4000 *s;
int ret; int ret;
unsigned int utmp; unsigned int utmp;
static const struct regmap_config regmap_config = { static const struct regmap_config regmap_config = {
@ -487,28 +487,28 @@ static int e4000_probe(struct i2c_client *client,
.max_register = 0xff, .max_register = 0xff,
}; };
priv = kzalloc(sizeof(struct e4000_priv), GFP_KERNEL); s = kzalloc(sizeof(struct e4000), GFP_KERNEL);
if (!priv) { if (!s) {
ret = -ENOMEM; ret = -ENOMEM;
dev_err(&client->dev, "%s: kzalloc() failed\n", KBUILD_MODNAME); dev_err(&client->dev, "%s: kzalloc() failed\n", KBUILD_MODNAME);
goto err; goto err;
} }
priv->clock = cfg->clock; s->clock = cfg->clock;
priv->client = client; s->client = client;
priv->fe = cfg->fe; s->fe = cfg->fe;
priv->regmap = devm_regmap_init_i2c(client, &regmap_config); s->regmap = devm_regmap_init_i2c(client, &regmap_config);
if (IS_ERR(priv->regmap)) { if (IS_ERR(s->regmap)) {
ret = PTR_ERR(priv->regmap); ret = PTR_ERR(s->regmap);
goto err; goto err;
} }
/* check if the tuner is there */ /* check if the tuner is there */
ret = regmap_read(priv->regmap, 0x02, &utmp); ret = regmap_read(s->regmap, 0x02, &utmp);
if (ret < 0) if (ret)
goto err; goto err;
dev_dbg(&priv->client->dev, "%s: chip id=%02x\n", __func__, utmp); dev_dbg(&s->client->dev, "%s: chip id=%02x\n", __func__, utmp);
if (utmp != 0x40) { if (utmp != 0x40) {
ret = -ENODEV; ret = -ENODEV;
@ -516,59 +516,59 @@ static int e4000_probe(struct i2c_client *client,
} }
/* put sleep as chip seems to be in normal mode by default */ /* put sleep as chip seems to be in normal mode by default */
ret = regmap_write(priv->regmap, 0x00, 0x00); ret = regmap_write(s->regmap, 0x00, 0x00);
if (ret < 0) if (ret)
goto err; goto err;
/* Register controls */ /* Register controls */
v4l2_ctrl_handler_init(&priv->hdl, 9); v4l2_ctrl_handler_init(&s->hdl, 9);
priv->bandwidth_auto = v4l2_ctrl_new_std(&priv->hdl, &e4000_ctrl_ops, s->bandwidth_auto = v4l2_ctrl_new_std(&s->hdl, &e4000_ctrl_ops,
V4L2_CID_RF_TUNER_BANDWIDTH_AUTO, 0, 1, 1, 1); V4L2_CID_RF_TUNER_BANDWIDTH_AUTO, 0, 1, 1, 1);
priv->bandwidth = v4l2_ctrl_new_std(&priv->hdl, &e4000_ctrl_ops, s->bandwidth = v4l2_ctrl_new_std(&s->hdl, &e4000_ctrl_ops,
V4L2_CID_RF_TUNER_BANDWIDTH, 4300000, 11000000, 100000, 4300000); V4L2_CID_RF_TUNER_BANDWIDTH, 4300000, 11000000, 100000, 4300000);
v4l2_ctrl_auto_cluster(2, &priv->bandwidth_auto, 0, false); v4l2_ctrl_auto_cluster(2, &s->bandwidth_auto, 0, false);
priv->lna_gain_auto = v4l2_ctrl_new_std(&priv->hdl, &e4000_ctrl_ops, s->lna_gain_auto = v4l2_ctrl_new_std(&s->hdl, &e4000_ctrl_ops,
V4L2_CID_RF_TUNER_LNA_GAIN_AUTO, 0, 1, 1, 1); V4L2_CID_RF_TUNER_LNA_GAIN_AUTO, 0, 1, 1, 1);
priv->lna_gain = v4l2_ctrl_new_std(&priv->hdl, &e4000_ctrl_ops, s->lna_gain = v4l2_ctrl_new_std(&s->hdl, &e4000_ctrl_ops,
V4L2_CID_RF_TUNER_LNA_GAIN, 0, 15, 1, 10); V4L2_CID_RF_TUNER_LNA_GAIN, 0, 15, 1, 10);
v4l2_ctrl_auto_cluster(2, &priv->lna_gain_auto, 0, false); v4l2_ctrl_auto_cluster(2, &s->lna_gain_auto, 0, false);
priv->mixer_gain_auto = v4l2_ctrl_new_std(&priv->hdl, &e4000_ctrl_ops, s->mixer_gain_auto = v4l2_ctrl_new_std(&s->hdl, &e4000_ctrl_ops,
V4L2_CID_RF_TUNER_MIXER_GAIN_AUTO, 0, 1, 1, 1); V4L2_CID_RF_TUNER_MIXER_GAIN_AUTO, 0, 1, 1, 1);
priv->mixer_gain = v4l2_ctrl_new_std(&priv->hdl, &e4000_ctrl_ops, s->mixer_gain = v4l2_ctrl_new_std(&s->hdl, &e4000_ctrl_ops,
V4L2_CID_RF_TUNER_MIXER_GAIN, 0, 1, 1, 1); V4L2_CID_RF_TUNER_MIXER_GAIN, 0, 1, 1, 1);
v4l2_ctrl_auto_cluster(2, &priv->mixer_gain_auto, 0, false); v4l2_ctrl_auto_cluster(2, &s->mixer_gain_auto, 0, false);
priv->if_gain_auto = v4l2_ctrl_new_std(&priv->hdl, &e4000_ctrl_ops, s->if_gain_auto = v4l2_ctrl_new_std(&s->hdl, &e4000_ctrl_ops,
V4L2_CID_RF_TUNER_IF_GAIN_AUTO, 0, 1, 1, 1); V4L2_CID_RF_TUNER_IF_GAIN_AUTO, 0, 1, 1, 1);
priv->if_gain = v4l2_ctrl_new_std(&priv->hdl, &e4000_ctrl_ops, s->if_gain = v4l2_ctrl_new_std(&s->hdl, &e4000_ctrl_ops,
V4L2_CID_RF_TUNER_IF_GAIN, 0, 54, 1, 0); V4L2_CID_RF_TUNER_IF_GAIN, 0, 54, 1, 0);
v4l2_ctrl_auto_cluster(2, &priv->if_gain_auto, 0, false); v4l2_ctrl_auto_cluster(2, &s->if_gain_auto, 0, false);
priv->pll_lock = v4l2_ctrl_new_std(&priv->hdl, &e4000_ctrl_ops, s->pll_lock = v4l2_ctrl_new_std(&s->hdl, &e4000_ctrl_ops,
V4L2_CID_RF_TUNER_PLL_LOCK, 0, 1, 1, 0); V4L2_CID_RF_TUNER_PLL_LOCK, 0, 1, 1, 0);
if (priv->hdl.error) { if (s->hdl.error) {
ret = priv->hdl.error; ret = s->hdl.error;
dev_err(&priv->client->dev, "Could not initialize controls\n"); dev_err(&s->client->dev, "Could not initialize controls\n");
v4l2_ctrl_handler_free(&priv->hdl); v4l2_ctrl_handler_free(&s->hdl);
goto err; goto err;
} }
priv->sd.ctrl_handler = &priv->hdl; s->sd.ctrl_handler = &s->hdl;
dev_info(&priv->client->dev, dev_info(&s->client->dev,
"%s: Elonics E4000 successfully identified\n", "%s: Elonics E4000 successfully identified\n",
KBUILD_MODNAME); KBUILD_MODNAME);
fe->tuner_priv = priv; fe->tuner_priv = s;
memcpy(&fe->ops.tuner_ops, &e4000_tuner_ops, memcpy(&fe->ops.tuner_ops, &e4000_tuner_ops,
sizeof(struct dvb_tuner_ops)); sizeof(struct dvb_tuner_ops));
v4l2_set_subdevdata(&priv->sd, client); v4l2_set_subdevdata(&s->sd, client);
i2c_set_clientdata(client, &priv->sd); i2c_set_clientdata(client, &s->sd);
return 0; return 0;
err: err:
if (ret) { if (ret) {
dev_dbg(&client->dev, "%s: failed=%d\n", __func__, ret); dev_dbg(&client->dev, "%s: failed=%d\n", __func__, ret);
kfree(priv); kfree(s);
} }
return ret; return ret;
@ -577,15 +577,15 @@ err:
static int e4000_remove(struct i2c_client *client) static int e4000_remove(struct i2c_client *client)
{ {
struct v4l2_subdev *sd = i2c_get_clientdata(client); struct v4l2_subdev *sd = i2c_get_clientdata(client);
struct e4000_priv *priv = container_of(sd, struct e4000_priv, sd); struct e4000 *s = container_of(sd, struct e4000, sd);
struct dvb_frontend *fe = priv->fe; struct dvb_frontend *fe = s->fe;
dev_dbg(&client->dev, "%s:\n", __func__); dev_dbg(&client->dev, "%s:\n", __func__);
v4l2_ctrl_handler_free(&priv->hdl); v4l2_ctrl_handler_free(&s->hdl);
memset(&fe->ops.tuner_ops, 0, sizeof(struct dvb_tuner_ops)); memset(&fe->ops.tuner_ops, 0, sizeof(struct dvb_tuner_ops));
fe->tuner_priv = NULL; fe->tuner_priv = NULL;
kfree(priv); kfree(s);
return 0; return 0;
} }

2
drivers/media/tuners/e4000_priv.h
View file

@ -26,7 +26,7 @@
#include <media/v4l2-subdev.h> #include <media/v4l2-subdev.h>
#include <linux/regmap.h> #include <linux/regmap.h>
struct e4000_priv { struct e4000 {
struct i2c_client *client; struct i2c_client *client;
struct regmap *regmap; struct regmap *regmap;
u32 clock; u32 clock;