Skip to content

L
linux
Commit e4a42e18 authored by Antti Palosaari's avatar Antti Palosaari Committed by Mauro Carvalho Chehab
Browse files
Options

[media] tda18212: rename state from 'priv' to 'dev' 

foo_dev seems to be most correct term for the structure holding data
of each device instance. It is most used term in Kernel codebase and also
examples from book Linux Device Drivers, Third Edition, uses it.
Signed-off-by: default avatarAntti Palosaari <crope@iki.fi>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent bdb32655
Show whitespace changes
Inline Side-by-side
Showing with 51 additions and 53 deletions
drivers/media/tuners/tda18212.c
View file @ e4a42e18
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
/* Max transfer size done by I2C transfer functions */ /* Max transfer size done by I2C transfer functions */
#define MAX_XFER_SIZE 64 #define MAX_XFER_SIZE 64
struct tda18212_priv { struct tda18212_dev {
struct tda18212_config cfg; struct tda18212_config cfg;
struct i2c_client *client; struct i2c_client *client;
...@@ -31,14 +31,13 @@ struct tda18212_priv { ...@@ -31,14 +31,13 @@ struct tda18212_priv {
}; };
/* write multiple registers */ /* write multiple registers */
static int tda18212_wr_regs(struct tda18212_priv *priv, u8 reg, u8 *val, static int tda18212_wr_regs(struct tda18212_dev *dev, u8 reg, u8 *val, int len)
int len)
{ {
int ret; int ret;
u8 buf[MAX_XFER_SIZE]; u8 buf[MAX_XFER_SIZE];
struct i2c_msg msg[1] = { struct i2c_msg msg[1] = {
{ {
.addr = priv->client->addr, .addr = dev->client->addr,
.flags = 0, .flags = 0,
.len = 1 + len, .len = 1 + len,
.buf = buf, .buf = buf,
...@@ -46,7 +45,7 @@ static int tda18212_wr_regs(struct tda18212_priv *priv, u8 reg, u8 *val, ...@@ -46,7 +45,7 @@ static int tda18212_wr_regs(struct tda18212_priv *priv, u8 reg, u8 *val,
}; };
if (1 + len > sizeof(buf)) { if (1 + len > sizeof(buf)) {
dev_warn(&priv->client->dev, dev_warn(&dev->client->dev,
"i2c wr reg=%04x: len=%d is too big!\n", "i2c wr reg=%04x: len=%d is too big!\n",
reg, len); reg, len);
return -EINVAL; return -EINVAL;
...@@ -55,11 +54,11 @@ static int tda18212_wr_regs(struct tda18212_priv *priv, u8 reg, u8 *val, ...@@ -55,11 +54,11 @@ static int tda18212_wr_regs(struct tda18212_priv *priv, u8 reg, u8 *val,
buf[0] = reg; buf[0] = reg;
memcpy(&buf[1], val, len); memcpy(&buf[1], val, len);
ret = i2c_transfer(priv->client->adapter, msg, 1); ret = i2c_transfer(dev->client->adapter, msg, 1);
if (ret == 1) { if (ret == 1) {
ret = 0; ret = 0;
} else { } else {
dev_warn(&priv->client->dev, dev_warn(&dev->client->dev,
"i2c wr failed=%d reg=%02x len=%d\n", "i2c wr failed=%d reg=%02x len=%d\n",
ret, reg, len); ret, reg, len);
ret = -EREMOTEIO; ret = -EREMOTEIO;
...@@ -68,19 +67,18 @@ static int tda18212_wr_regs(struct tda18212_priv *priv, u8 reg, u8 *val, ...@@ -68,19 +67,18 @@ static int tda18212_wr_regs(struct tda18212_priv *priv, u8 reg, u8 *val,
} }
/* read multiple registers */ /* read multiple registers */
static int tda18212_rd_regs(struct tda18212_priv *priv, u8 reg, u8 *val, static int tda18212_rd_regs(struct tda18212_dev *dev, u8 reg, u8 *val, int len)
int len)
{ {
int ret; int ret;
u8 buf[MAX_XFER_SIZE]; u8 buf[MAX_XFER_SIZE];
struct i2c_msg msg[2] = { struct i2c_msg msg[2] = {
{ {
.addr = priv->client->addr, .addr = dev->client->addr,
.flags = 0, .flags = 0,
.len = 1, .len = 1,
.buf = &reg, .buf = &reg,
}, { }, {
.addr = priv->client->addr, .addr = dev->client->addr,
.flags = I2C_M_RD, .flags = I2C_M_RD,
.len = len, .len = len,
.buf = buf, .buf = buf,
...@@ -88,18 +86,18 @@ static int tda18212_rd_regs(struct tda18212_priv *priv, u8 reg, u8 *val, ...@@ -88,18 +86,18 @@ static int tda18212_rd_regs(struct tda18212_priv *priv, u8 reg, u8 *val,
}; };
if (len > sizeof(buf)) { if (len > sizeof(buf)) {
dev_warn(&priv->client->dev, dev_warn(&dev->client->dev,
"i2c rd reg=%04x: len=%d is too big!\n", "i2c rd reg=%04x: len=%d is too big!\n",
reg, len); reg, len);
return -EINVAL; return -EINVAL;
} }
ret = i2c_transfer(priv->client->adapter, msg, 2); ret = i2c_transfer(dev->client->adapter, msg, 2);
if (ret == 2) { if (ret == 2) {
memcpy(val, buf, len); memcpy(val, buf, len);
ret = 0; ret = 0;
} else { } else {
dev_warn(&priv->client->dev, dev_warn(&dev->client->dev,
"i2c rd failed=%d reg=%02x len=%d\n", "i2c rd failed=%d reg=%02x len=%d\n",
ret, reg, len); ret, reg, len);
ret = -EREMOTEIO; ret = -EREMOTEIO;
...@@ -109,26 +107,26 @@ static int tda18212_rd_regs(struct tda18212_priv *priv, u8 reg, u8 *val, ...@@ -109,26 +107,26 @@ static int tda18212_rd_regs(struct tda18212_priv *priv, u8 reg, u8 *val,
} }
/* write single register */ /* write single register */
static int tda18212_wr_reg(struct tda18212_priv *priv, u8 reg, u8 val) static int tda18212_wr_reg(struct tda18212_dev *dev, u8 reg, u8 val)
{ {
return tda18212_wr_regs(priv, reg, &val, 1); return tda18212_wr_regs(dev, reg, &val, 1);
} }
/* read single register */ /* read single register */
static int tda18212_rd_reg(struct tda18212_priv *priv, u8 reg, u8 *val) static int tda18212_rd_reg(struct tda18212_dev *dev, u8 reg, u8 *val)
{ {
return tda18212_rd_regs(priv, reg, val, 1); return tda18212_rd_regs(dev, reg, val, 1);
} }
#if 0 /* keep, useful when developing driver */ #if 0 /* keep, useful when developing driver */
static void tda18212_dump_regs(struct tda18212_priv *priv) static void tda18212_dump_regs(struct tda18212_dev *dev)
{ {
int i; int i;
u8 buf[256]; u8 buf[256];
#define TDA18212_RD_LEN 32 #define TDA18212_RD_LEN 32
for (i = 0; i < sizeof(buf); i += TDA18212_RD_LEN) for (i = 0; i < sizeof(buf); i += TDA18212_RD_LEN)
tda18212_rd_regs(priv, i, &buf[i], TDA18212_RD_LEN); tda18212_rd_regs(dev, i, &buf[i], TDA18212_RD_LEN);
print_hex_dump(KERN_INFO, "", DUMP_PREFIX_OFFSET, 32, 1, buf, print_hex_dump(KERN_INFO, "", DUMP_PREFIX_OFFSET, 32, 1, buf,
sizeof(buf), true); sizeof(buf), true);
...@@ -139,7 +137,7 @@ static void tda18212_dump_regs(struct tda18212_priv *priv) ...@@ -139,7 +137,7 @@ static void tda18212_dump_regs(struct tda18212_priv *priv)
static int tda18212_set_params(struct dvb_frontend *fe) static int tda18212_set_params(struct dvb_frontend *fe)
{ {
struct tda18212_priv *priv = fe->tuner_priv; struct tda18212_dev *dev = fe->tuner_priv;
struct dtv_frontend_properties *c = &fe->dtv_property_cache; struct dtv_frontend_properties *c = &fe->dtv_property_cache;
int ret, i; int ret, i;
u32 if_khz; u32 if_khz;
...@@ -168,7 +166,7 @@ static int tda18212_set_params(struct dvb_frontend *fe) ...@@ -168,7 +166,7 @@ static int tda18212_set_params(struct dvb_frontend *fe)
[ATSC_QAM] = { 0x7d, 0x20, 0x63 }, [ATSC_QAM] = { 0x7d, 0x20, 0x63 },
}; };
dev_dbg(&priv->client->dev, dev_dbg(&dev->client->dev,
"delivery_system=%d frequency=%d bandwidth_hz=%d\n", "delivery_system=%d frequency=%d bandwidth_hz=%d\n",
c->delivery_system, c->frequency, c->delivery_system, c->frequency,
c->bandwidth_hz); c->bandwidth_hz);
...@@ -178,25 +176,25 @@ static int tda18212_set_params(struct dvb_frontend *fe) ...@@ -178,25 +176,25 @@ static int tda18212_set_params(struct dvb_frontend *fe)
switch (c->delivery_system) { switch (c->delivery_system) {
case SYS_ATSC: case SYS_ATSC:
if_khz = priv->cfg.if_atsc_vsb; if_khz = dev->cfg.if_atsc_vsb;
i = ATSC_VSB; i = ATSC_VSB;
break; break;
case SYS_DVBC_ANNEX_B: case SYS_DVBC_ANNEX_B:
if_khz = priv->cfg.if_atsc_qam; if_khz = dev->cfg.if_atsc_qam;
i = ATSC_QAM; i = ATSC_QAM;
break; break;
case SYS_DVBT: case SYS_DVBT:
switch (c->bandwidth_hz) { switch (c->bandwidth_hz) {
case 6000000: case 6000000:
if_khz = priv->cfg.if_dvbt_6; if_khz = dev->cfg.if_dvbt_6;
i = DVBT_6; i = DVBT_6;
break; break;
case 7000000: case 7000000:
if_khz = priv->cfg.if_dvbt_7; if_khz = dev->cfg.if_dvbt_7;
i = DVBT_7; i = DVBT_7;
break; break;
case 8000000: case 8000000:
if_khz = priv->cfg.if_dvbt_8; if_khz = dev->cfg.if_dvbt_8;
i = DVBT_8; i = DVBT_8;
break; break;
default: default:
...@@ -207,15 +205,15 @@ static int tda18212_set_params(struct dvb_frontend *fe) ...@@ -207,15 +205,15 @@ static int tda18212_set_params(struct dvb_frontend *fe)
case SYS_DVBT2: case SYS_DVBT2:
switch (c->bandwidth_hz) { switch (c->bandwidth_hz) {
case 6000000: case 6000000:
if_khz = priv->cfg.if_dvbt2_6; if_khz = dev->cfg.if_dvbt2_6;
i = DVBT2_6; i = DVBT2_6;
break; break;
case 7000000: case 7000000:
if_khz = priv->cfg.if_dvbt2_7; if_khz = dev->cfg.if_dvbt2_7;
i = DVBT2_7; i = DVBT2_7;
break; break;
case 8000000: case 8000000:
if_khz = priv->cfg.if_dvbt2_8; if_khz = dev->cfg.if_dvbt2_8;
i = DVBT2_8; i = DVBT2_8;
break; break;
default: default:
...@@ -225,7 +223,7 @@ static int tda18212_set_params(struct dvb_frontend *fe) ...@@ -225,7 +223,7 @@ static int tda18212_set_params(struct dvb_frontend *fe)
break; break;
case SYS_DVBC_ANNEX_A: case SYS_DVBC_ANNEX_A:
case SYS_DVBC_ANNEX_C: case SYS_DVBC_ANNEX_C:
if_khz = priv->cfg.if_dvbc; if_khz = dev->cfg.if_dvbc;
i = DVBC_8; i = DVBC_8;
break; break;
default: default:
...@@ -233,15 +231,15 @@ static int tda18212_set_params(struct dvb_frontend *fe) ...@@ -233,15 +231,15 @@ static int tda18212_set_params(struct dvb_frontend *fe)
goto error; goto error;
} }
ret = tda18212_wr_reg(priv, 0x23, bw_params[i][2]); ret = tda18212_wr_reg(dev, 0x23, bw_params[i][2]);
if (ret) if (ret)
goto error; goto error;
ret = tda18212_wr_reg(priv, 0x06, 0x00); ret = tda18212_wr_reg(dev, 0x06, 0x00);
if (ret) if (ret)
goto error; goto error;
ret = tda18212_wr_reg(priv, 0x0f, bw_params[i][0]); ret = tda18212_wr_reg(dev, 0x0f, bw_params[i][0]);
if (ret) if (ret)
goto error; goto error;
...@@ -254,12 +252,12 @@ static int tda18212_set_params(struct dvb_frontend *fe) ...@@ -254,12 +252,12 @@ static int tda18212_set_params(struct dvb_frontend *fe)
buf[6] = ((c->frequency / 1000) >> 0) & 0xff; buf[6] = ((c->frequency / 1000) >> 0) & 0xff;
buf[7] = 0xc1; buf[7] = 0xc1;
buf[8] = 0x01; buf[8] = 0x01;
ret = tda18212_wr_regs(priv, 0x12, buf, sizeof(buf)); ret = tda18212_wr_regs(dev, 0x12, buf, sizeof(buf));
if (ret) if (ret)
goto error; goto error;
/* actual IF rounded as it is on register */ /* actual IF rounded as it is on register */
priv->if_frequency = buf[3] * 50 * 1000; dev->if_frequency = buf[3] * 50 * 1000;
exit: exit:
if (fe->ops.i2c_gate_ctrl) if (fe->ops.i2c_gate_ctrl)
...@@ -268,15 +266,15 @@ static int tda18212_set_params(struct dvb_frontend *fe) ...@@ -268,15 +266,15 @@ static int tda18212_set_params(struct dvb_frontend *fe)
return ret; return ret;
error: error:
dev_dbg(&priv->client->dev, "failed=%d\n", ret); dev_dbg(&dev->client->dev, "failed=%d\n", ret);
goto exit; goto exit;
} }
static int tda18212_get_if_frequency(struct dvb_frontend *fe, u32 *frequency) static int tda18212_get_if_frequency(struct dvb_frontend *fe, u32 *frequency)
{ {
struct tda18212_priv *priv = fe->tuner_priv; struct tda18212_dev *dev = fe->tuner_priv;
*frequency = priv->if_frequency; *frequency = dev->if_frequency;
return 0; return 0;
} }
...@@ -299,27 +297,27 @@ static int tda18212_probe(struct i2c_client *client, ...@@ -299,27 +297,27 @@ static int tda18212_probe(struct i2c_client *client,
{ {
struct tda18212_config *cfg = client->dev.platform_data; struct tda18212_config *cfg = client->dev.platform_data;
struct dvb_frontend *fe = cfg->fe; struct dvb_frontend *fe = cfg->fe;
struct tda18212_priv *priv; struct tda18212_dev *dev;
int ret; int ret;
u8 chip_id = chip_id; u8 chip_id = chip_id;
char *version; char *version;
priv = kzalloc(sizeof(*priv), GFP_KERNEL); dev = kzalloc(sizeof(*dev), GFP_KERNEL);
if (!priv) { if (dev == NULL) {
ret = -ENOMEM; ret = -ENOMEM;
dev_err(&client->dev, "kzalloc() failed\n"); dev_err(&client->dev, "kzalloc() failed\n");
goto err; goto err;
} }
memcpy(&priv->cfg, cfg, sizeof(struct tda18212_config)); memcpy(&dev->cfg, cfg, sizeof(struct tda18212_config));
priv->client = client; dev->client = client;
/* check if the tuner is there */ /* check if the tuner is there */
if (fe->ops.i2c_gate_ctrl) if (fe->ops.i2c_gate_ctrl)
fe->ops.i2c_gate_ctrl(fe, 1); /* open I2C-gate */ fe->ops.i2c_gate_ctrl(fe, 1); /* open I2C-gate */
ret = tda18212_rd_reg(priv, 0x00, &chip_id); ret = tda18212_rd_reg(dev, 0x00, &chip_id);
dev_dbg(&priv->client->dev, "chip_id=%02x\n", chip_id); dev_dbg(&dev->client->dev, "chip_id=%02x\n", chip_id);
if (fe->ops.i2c_gate_ctrl) if (fe->ops.i2c_gate_ctrl)
fe->ops.i2c_gate_ctrl(fe, 0); /* close I2C-gate */ fe->ops.i2c_gate_ctrl(fe, 0); /* close I2C-gate */
...@@ -339,31 +337,31 @@ static int tda18212_probe(struct i2c_client *client, ...@@ -339,31 +337,31 @@ static int tda18212_probe(struct i2c_client *client,
goto err; goto err;
} }
dev_info(&priv->client->dev, dev_info(&dev->client->dev,
"NXP TDA18212HN/%s successfully identified\n", version); "NXP TDA18212HN/%s successfully identified\n", version);
fe->tuner_priv = priv; fe->tuner_priv = dev;
memcpy(&fe->ops.tuner_ops, &tda18212_tuner_ops, memcpy(&fe->ops.tuner_ops, &tda18212_tuner_ops,
sizeof(struct dvb_tuner_ops)); sizeof(struct dvb_tuner_ops));
i2c_set_clientdata(client, priv); i2c_set_clientdata(client, dev);
return 0; return 0;
err: err:
dev_dbg(&client->dev, "failed=%d\n", ret); dev_dbg(&client->dev, "failed=%d\n", ret);
kfree(priv); kfree(dev);
return ret; return ret;
} }
static int tda18212_remove(struct i2c_client *client) static int tda18212_remove(struct i2c_client *client)
{ {
struct tda18212_priv *priv = i2c_get_clientdata(client); struct tda18212_dev *dev = i2c_get_clientdata(client);
struct dvb_frontend *fe = priv->cfg.fe; struct dvb_frontend *fe = dev->cfg.fe;
dev_dbg(&client->dev, "\n"); dev_dbg(&client->dev, "\n");
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(dev);
return 0; return 0;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7