Skip to content

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

[media] si2168: carry pointer to client instead of state 

Carry struct i2c_client pointer inside struct dvb_frontend private
pointer. This driver is I2C driver, which is represented as a
struct i2c_client, so better to carry this top level structure for
each routine in order to unify things. This allows further
simplification.
Signed-off-by: default avatarAntti Palosaari <crope@iki.fi>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent bd01c766
Hide whitespace changes
Inline Side-by-side
Showing with 45 additions and 38 deletions
drivers/media/dvb-frontends/si2168.c
View file @ 6307b560
...@@ -19,8 +19,9 @@ ...@@ -19,8 +19,9 @@
static const struct dvb_frontend_ops si2168_ops; static const struct dvb_frontend_ops si2168_ops;
/* execute firmware command */ /* execute firmware command */
static int si2168_cmd_execute(struct si2168_dev *dev, struct si2168_cmd *cmd) static int si2168_cmd_execute(struct i2c_client *client, struct si2168_cmd *cmd)
{ {
struct si2168_dev *dev = i2c_get_clientdata(client);
int ret; int ret;
unsigned long timeout; unsigned long timeout;
...@@ -80,7 +81,8 @@ static int si2168_cmd_execute(struct si2168_dev *dev, struct si2168_cmd *cmd) ...@@ -80,7 +81,8 @@ static int si2168_cmd_execute(struct si2168_dev *dev, struct si2168_cmd *cmd)
static int si2168_read_status(struct dvb_frontend *fe, fe_status_t *status) static int si2168_read_status(struct dvb_frontend *fe, fe_status_t *status)
{ {
struct si2168_dev *dev = fe->demodulator_priv; struct i2c_client *client = fe->demodulator_priv;
struct si2168_dev *dev = i2c_get_clientdata(client);
struct dtv_frontend_properties *c = &fe->dtv_property_cache; struct dtv_frontend_properties *c = &fe->dtv_property_cache;
int ret; int ret;
struct si2168_cmd cmd; struct si2168_cmd cmd;
...@@ -113,7 +115,7 @@ static int si2168_read_status(struct dvb_frontend *fe, fe_status_t *status) ...@@ -113,7 +115,7 @@ static int si2168_read_status(struct dvb_frontend *fe, fe_status_t *status)
goto err; goto err;
} }
ret = si2168_cmd_execute(dev, &cmd); ret = si2168_cmd_execute(client, &cmd);
if (ret) if (ret)
goto err; goto err;
...@@ -160,7 +162,8 @@ static int si2168_read_status(struct dvb_frontend *fe, fe_status_t *status) ...@@ -160,7 +162,8 @@ static int si2168_read_status(struct dvb_frontend *fe, fe_status_t *status)
static int si2168_set_frontend(struct dvb_frontend *fe) static int si2168_set_frontend(struct dvb_frontend *fe)
{ {
struct si2168_dev *dev = fe->demodulator_priv; struct i2c_client *client = fe->demodulator_priv;
struct si2168_dev *dev = i2c_get_clientdata(client);
struct dtv_frontend_properties *c = &fe->dtv_property_cache; struct dtv_frontend_properties *c = &fe->dtv_property_cache;
int ret; int ret;
struct si2168_cmd cmd; struct si2168_cmd cmd;
...@@ -217,7 +220,7 @@ static int si2168_set_frontend(struct dvb_frontend *fe) ...@@ -217,7 +220,7 @@ static int si2168_set_frontend(struct dvb_frontend *fe)
memcpy(cmd.args, "\x88\x02\x02\x02\x02", 5); memcpy(cmd.args, "\x88\x02\x02\x02\x02", 5);
cmd.wlen = 5; cmd.wlen = 5;
cmd.rlen = 5; cmd.rlen = 5;
ret = si2168_cmd_execute(dev, &cmd); ret = si2168_cmd_execute(client, &cmd);
if (ret) if (ret)
goto err; goto err;
...@@ -230,7 +233,7 @@ static int si2168_set_frontend(struct dvb_frontend *fe) ...@@ -230,7 +233,7 @@ static int si2168_set_frontend(struct dvb_frontend *fe)
memcpy(cmd.args, "\x89\x21\x06\x11\x89\x20", 6); memcpy(cmd.args, "\x89\x21\x06\x11\x89\x20", 6);
cmd.wlen = 6; cmd.wlen = 6;
cmd.rlen = 3; cmd.rlen = 3;
ret = si2168_cmd_execute(dev, &cmd); ret = si2168_cmd_execute(client, &cmd);
if (ret) if (ret)
goto err; goto err;
...@@ -241,7 +244,7 @@ static int si2168_set_frontend(struct dvb_frontend *fe) ...@@ -241,7 +244,7 @@ static int si2168_set_frontend(struct dvb_frontend *fe)
cmd.args[2] = c->stream_id == NO_STREAM_ID_FILTER ? 0 : 1; cmd.args[2] = c->stream_id == NO_STREAM_ID_FILTER ? 0 : 1;
cmd.wlen = 3; cmd.wlen = 3;
cmd.rlen = 1; cmd.rlen = 1;
ret = si2168_cmd_execute(dev, &cmd); ret = si2168_cmd_execute(client, &cmd);
if (ret) if (ret)
goto err; goto err;
} }
...@@ -249,35 +252,35 @@ static int si2168_set_frontend(struct dvb_frontend *fe) ...@@ -249,35 +252,35 @@ static int si2168_set_frontend(struct dvb_frontend *fe)
memcpy(cmd.args, "\x51\x03", 2); memcpy(cmd.args, "\x51\x03", 2);
cmd.wlen = 2; cmd.wlen = 2;
cmd.rlen = 12; cmd.rlen = 12;
ret = si2168_cmd_execute(dev, &cmd); ret = si2168_cmd_execute(client, &cmd);
if (ret) if (ret)
goto err; goto err;
memcpy(cmd.args, "\x12\x08\x04", 3); memcpy(cmd.args, "\x12\x08\x04", 3);
cmd.wlen = 3; cmd.wlen = 3;
cmd.rlen = 3; cmd.rlen = 3;
ret = si2168_cmd_execute(dev, &cmd); ret = si2168_cmd_execute(client, &cmd);
if (ret) if (ret)
goto err; goto err;
memcpy(cmd.args, "\x14\x00\x0c\x10\x12\x00", 6); memcpy(cmd.args, "\x14\x00\x0c\x10\x12\x00", 6);
cmd.wlen = 6; cmd.wlen = 6;
cmd.rlen = 4; cmd.rlen = 4;
ret = si2168_cmd_execute(dev, &cmd); ret = si2168_cmd_execute(client, &cmd);
if (ret) if (ret)
goto err; goto err;
memcpy(cmd.args, "\x14\x00\x06\x10\x24\x00", 6); memcpy(cmd.args, "\x14\x00\x06\x10\x24\x00", 6);
cmd.wlen = 6; cmd.wlen = 6;
cmd.rlen = 4; cmd.rlen = 4;
ret = si2168_cmd_execute(dev, &cmd); ret = si2168_cmd_execute(client, &cmd);
if (ret) if (ret)
goto err; goto err;
memcpy(cmd.args, "\x14\x00\x07\x10\x00\x24", 6); memcpy(cmd.args, "\x14\x00\x07\x10\x00\x24", 6);
cmd.wlen = 6; cmd.wlen = 6;
cmd.rlen = 4; cmd.rlen = 4;
ret = si2168_cmd_execute(dev, &cmd); ret = si2168_cmd_execute(client, &cmd);
if (ret) if (ret)
goto err; goto err;
...@@ -285,7 +288,7 @@ static int si2168_set_frontend(struct dvb_frontend *fe) ...@@ -285,7 +288,7 @@ static int si2168_set_frontend(struct dvb_frontend *fe)
cmd.args[4] = delivery_system | bandwidth; cmd.args[4] = delivery_system | bandwidth;
cmd.wlen = 6; cmd.wlen = 6;
cmd.rlen = 4; cmd.rlen = 4;
ret = si2168_cmd_execute(dev, &cmd); ret = si2168_cmd_execute(client, &cmd);
if (ret) if (ret)
goto err; goto err;
...@@ -296,7 +299,7 @@ static int si2168_set_frontend(struct dvb_frontend *fe) ...@@ -296,7 +299,7 @@ static int si2168_set_frontend(struct dvb_frontend *fe)
cmd.args[5] = ((c->symbol_rate / 1000) >> 8) & 0xff; cmd.args[5] = ((c->symbol_rate / 1000) >> 8) & 0xff;
cmd.wlen = 6; cmd.wlen = 6;
cmd.rlen = 4; cmd.rlen = 4;
ret = si2168_cmd_execute(dev, &cmd); ret = si2168_cmd_execute(client, &cmd);
if (ret) if (ret)
goto err; goto err;
} }
...@@ -304,7 +307,7 @@ static int si2168_set_frontend(struct dvb_frontend *fe) ...@@ -304,7 +307,7 @@ static int si2168_set_frontend(struct dvb_frontend *fe)
memcpy(cmd.args, "\x14\x00\x0f\x10\x10\x00", 6); memcpy(cmd.args, "\x14\x00\x0f\x10\x10\x00", 6);
cmd.wlen = 6; cmd.wlen = 6;
cmd.rlen = 4; cmd.rlen = 4;
ret = si2168_cmd_execute(dev, &cmd); ret = si2168_cmd_execute(client, &cmd);
if (ret) if (ret)
goto err; goto err;
...@@ -312,7 +315,7 @@ static int si2168_set_frontend(struct dvb_frontend *fe) ...@@ -312,7 +315,7 @@ static int si2168_set_frontend(struct dvb_frontend *fe)
cmd.args[5] |= dev->ts_clock_inv ? 0x00 : 0x10; cmd.args[5] |= dev->ts_clock_inv ? 0x00 : 0x10;
cmd.wlen = 6; cmd.wlen = 6;
cmd.rlen = 4; cmd.rlen = 4;
ret = si2168_cmd_execute(dev, &cmd); ret = si2168_cmd_execute(client, &cmd);
if (ret) if (ret)
goto err; goto err;
...@@ -320,28 +323,28 @@ static int si2168_set_frontend(struct dvb_frontend *fe) ...@@ -320,28 +323,28 @@ static int si2168_set_frontend(struct dvb_frontend *fe)
cmd.args[5] |= dev->ts_clock_inv ? 0x00 : 0x10; cmd.args[5] |= dev->ts_clock_inv ? 0x00 : 0x10;
cmd.wlen = 6; cmd.wlen = 6;
cmd.rlen = 4; cmd.rlen = 4;
ret = si2168_cmd_execute(dev, &cmd); ret = si2168_cmd_execute(client, &cmd);
if (ret) if (ret)
goto err; goto err;
memcpy(cmd.args, "\x14\x00\x01\x12\x00\x00", 6); memcpy(cmd.args, "\x14\x00\x01\x12\x00\x00", 6);
cmd.wlen = 6; cmd.wlen = 6;
cmd.rlen = 4; cmd.rlen = 4;
ret = si2168_cmd_execute(dev, &cmd); ret = si2168_cmd_execute(client, &cmd);
if (ret) if (ret)
goto err; goto err;
memcpy(cmd.args, "\x14\x00\x01\x03\x0c\x00", 6); memcpy(cmd.args, "\x14\x00\x01\x03\x0c\x00", 6);
cmd.wlen = 6; cmd.wlen = 6;
cmd.rlen = 4; cmd.rlen = 4;
ret = si2168_cmd_execute(dev, &cmd); ret = si2168_cmd_execute(client, &cmd);
if (ret) if (ret)
goto err; goto err;
memcpy(cmd.args, "\x85", 1); memcpy(cmd.args, "\x85", 1);
cmd.wlen = 1; cmd.wlen = 1;
cmd.rlen = 1; cmd.rlen = 1;
ret = si2168_cmd_execute(dev, &cmd); ret = si2168_cmd_execute(client, &cmd);
if (ret) if (ret)
goto err; goto err;
...@@ -355,7 +358,8 @@ static int si2168_set_frontend(struct dvb_frontend *fe) ...@@ -355,7 +358,8 @@ static int si2168_set_frontend(struct dvb_frontend *fe)
static int si2168_init(struct dvb_frontend *fe) static int si2168_init(struct dvb_frontend *fe)
{ {
struct si2168_dev *dev = fe->demodulator_priv; struct i2c_client *client = fe->demodulator_priv;
struct si2168_dev *dev = i2c_get_clientdata(client);
int ret, len, remaining; int ret, len, remaining;
const struct firmware *fw = NULL; const struct firmware *fw = NULL;
u8 *fw_file; u8 *fw_file;
...@@ -369,7 +373,7 @@ static int si2168_init(struct dvb_frontend *fe) ...@@ -369,7 +373,7 @@ static int si2168_init(struct dvb_frontend *fe)
memcpy(cmd.args, "\xc0\x12\x00\x0c\x00\x0d\x16\x00\x00\x00\x00\x00\x00", 13); memcpy(cmd.args, "\xc0\x12\x00\x0c\x00\x0d\x16\x00\x00\x00\x00\x00\x00", 13);
cmd.wlen = 13; cmd.wlen = 13;
cmd.rlen = 0; cmd.rlen = 0;
ret = si2168_cmd_execute(dev, &cmd); ret = si2168_cmd_execute(client, &cmd);
if (ret) if (ret)
goto err; goto err;
...@@ -378,14 +382,14 @@ static int si2168_init(struct dvb_frontend *fe) ...@@ -378,14 +382,14 @@ static int si2168_init(struct dvb_frontend *fe)
memcpy(cmd.args, "\xc0\x06\x08\x0f\x00\x20\x21\x01", 8); memcpy(cmd.args, "\xc0\x06\x08\x0f\x00\x20\x21\x01", 8);
cmd.wlen = 8; cmd.wlen = 8;
cmd.rlen = 1; cmd.rlen = 1;
ret = si2168_cmd_execute(dev, &cmd); ret = si2168_cmd_execute(client, &cmd);
if (ret) if (ret)
goto err; goto err;
memcpy(cmd.args, "\x85", 1); memcpy(cmd.args, "\x85", 1);
cmd.wlen = 1; cmd.wlen = 1;
cmd.rlen = 1; cmd.rlen = 1;
ret = si2168_cmd_execute(dev, &cmd); ret = si2168_cmd_execute(client, &cmd);
if (ret) if (ret)
goto err; goto err;
...@@ -396,7 +400,7 @@ static int si2168_init(struct dvb_frontend *fe) ...@@ -396,7 +400,7 @@ static int si2168_init(struct dvb_frontend *fe)
memcpy(cmd.args, "\xc0\x06\x01\x0f\x00\x20\x20\x01", 8); memcpy(cmd.args, "\xc0\x06\x01\x0f\x00\x20\x20\x01", 8);
cmd.wlen = 8; cmd.wlen = 8;
cmd.rlen = 1; cmd.rlen = 1;
ret = si2168_cmd_execute(dev, &cmd); ret = si2168_cmd_execute(client, &cmd);
if (ret) if (ret)
goto err; goto err;
...@@ -404,7 +408,7 @@ static int si2168_init(struct dvb_frontend *fe) ...@@ -404,7 +408,7 @@ static int si2168_init(struct dvb_frontend *fe)
memcpy(cmd.args, "\x02", 1); memcpy(cmd.args, "\x02", 1);
cmd.wlen = 1; cmd.wlen = 1;
cmd.rlen = 13; cmd.rlen = 13;
ret = si2168_cmd_execute(dev, &cmd); ret = si2168_cmd_execute(client, &cmd);
if (ret) if (ret)
goto err; goto err;
...@@ -469,7 +473,7 @@ static int si2168_init(struct dvb_frontend *fe) ...@@ -469,7 +473,7 @@ static int si2168_init(struct dvb_frontend *fe)
memcpy(cmd.args, &fw->data[(fw->size - remaining) + 1], len); memcpy(cmd.args, &fw->data[(fw->size - remaining) + 1], len);
cmd.wlen = len; cmd.wlen = len;
cmd.rlen = 1; cmd.rlen = 1;
ret = si2168_cmd_execute(dev, &cmd); ret = si2168_cmd_execute(client, &cmd);
if (ret) { if (ret) {
dev_err(&dev->client->dev, dev_err(&dev->client->dev,
"firmware download failed=%d\n", "firmware download failed=%d\n",
...@@ -487,7 +491,7 @@ static int si2168_init(struct dvb_frontend *fe) ...@@ -487,7 +491,7 @@ static int si2168_init(struct dvb_frontend *fe)
memcpy(cmd.args, &fw->data[fw->size - remaining], len); memcpy(cmd.args, &fw->data[fw->size - remaining], len);
cmd.wlen = len; cmd.wlen = len;
cmd.rlen = 1; cmd.rlen = 1;
ret = si2168_cmd_execute(dev, &cmd); ret = si2168_cmd_execute(client, &cmd);
if (ret) { if (ret) {
dev_err(&dev->client->dev, dev_err(&dev->client->dev,
"firmware download failed=%d\n", "firmware download failed=%d\n",
...@@ -503,7 +507,7 @@ static int si2168_init(struct dvb_frontend *fe) ...@@ -503,7 +507,7 @@ static int si2168_init(struct dvb_frontend *fe)
memcpy(cmd.args, "\x01\x01", 2); memcpy(cmd.args, "\x01\x01", 2);
cmd.wlen = 2; cmd.wlen = 2;
cmd.rlen = 1; cmd.rlen = 1;
ret = si2168_cmd_execute(dev, &cmd); ret = si2168_cmd_execute(client, &cmd);
if (ret) if (ret)
goto err; goto err;
...@@ -511,7 +515,7 @@ static int si2168_init(struct dvb_frontend *fe) ...@@ -511,7 +515,7 @@ static int si2168_init(struct dvb_frontend *fe)
memcpy(cmd.args, "\x11", 1); memcpy(cmd.args, "\x11", 1);
cmd.wlen = 1; cmd.wlen = 1;
cmd.rlen = 10; cmd.rlen = 10;
ret = si2168_cmd_execute(dev, &cmd); ret = si2168_cmd_execute(client, &cmd);
if (ret) if (ret)
goto err; goto err;
...@@ -523,7 +527,7 @@ static int si2168_init(struct dvb_frontend *fe) ...@@ -523,7 +527,7 @@ static int si2168_init(struct dvb_frontend *fe)
cmd.args[4] |= dev->ts_mode; cmd.args[4] |= dev->ts_mode;
cmd.wlen = 6; cmd.wlen = 6;
cmd.rlen = 4; cmd.rlen = 4;
ret = si2168_cmd_execute(dev, &cmd); ret = si2168_cmd_execute(client, &cmd);
if (ret) if (ret)
goto err; goto err;
...@@ -545,7 +549,8 @@ static int si2168_init(struct dvb_frontend *fe) ...@@ -545,7 +549,8 @@ static int si2168_init(struct dvb_frontend *fe)
static int si2168_sleep(struct dvb_frontend *fe) static int si2168_sleep(struct dvb_frontend *fe)
{ {
struct si2168_dev *dev = fe->demodulator_priv; struct i2c_client *client = fe->demodulator_priv;
struct si2168_dev *dev = i2c_get_clientdata(client);
int ret; int ret;
struct si2168_cmd cmd; struct si2168_cmd cmd;
...@@ -556,7 +561,7 @@ static int si2168_sleep(struct dvb_frontend *fe) ...@@ -556,7 +561,7 @@ static int si2168_sleep(struct dvb_frontend *fe)
memcpy(cmd.args, "\x13", 1); memcpy(cmd.args, "\x13", 1);
cmd.wlen = 1; cmd.wlen = 1;
cmd.rlen = 0; cmd.rlen = 0;
ret = si2168_cmd_execute(dev, &cmd); ret = si2168_cmd_execute(client, &cmd);
if (ret) if (ret)
goto err; goto err;
...@@ -581,7 +586,8 @@ static int si2168_get_tune_settings(struct dvb_frontend *fe, ...@@ -581,7 +586,8 @@ static int si2168_get_tune_settings(struct dvb_frontend *fe,
*/ */
static int si2168_select(struct i2c_adapter *adap, void *mux_priv, u32 chan) static int si2168_select(struct i2c_adapter *adap, void *mux_priv, u32 chan)
{ {
struct si2168_dev *dev = mux_priv; struct i2c_client *client = mux_priv;
struct si2168_dev *dev = i2c_get_clientdata(client);
int ret; int ret;
struct i2c_msg gate_open_msg = { struct i2c_msg gate_open_msg = {
.addr = dev->client->addr, .addr = dev->client->addr,
...@@ -607,7 +613,8 @@ static int si2168_select(struct i2c_adapter *adap, void *mux_priv, u32 chan) ...@@ -607,7 +613,8 @@ static int si2168_select(struct i2c_adapter *adap, void *mux_priv, u32 chan)
static int si2168_deselect(struct i2c_adapter *adap, void *mux_priv, u32 chan) static int si2168_deselect(struct i2c_adapter *adap, void *mux_priv, u32 chan)
{ {
struct si2168_dev *dev = mux_priv; struct i2c_client *client = mux_priv;
struct si2168_dev *dev = i2c_get_clientdata(client);
int ret; int ret;
struct i2c_msg gate_close_msg = { struct i2c_msg gate_close_msg = {
.addr = dev->client->addr, .addr = dev->client->addr,
...@@ -688,8 +695,8 @@ static int si2168_probe(struct i2c_client *client, ...@@ -688,8 +695,8 @@ static int si2168_probe(struct i2c_client *client,
mutex_init(&dev->i2c_mutex); mutex_init(&dev->i2c_mutex);
/* create mux i2c adapter for tuner */ /* create mux i2c adapter for tuner */
dev->adapter = i2c_add_mux_adapter(client->adapter, &client->dev, dev, dev->adapter = i2c_add_mux_adapter(client->adapter, &client->dev,
0, 0, 0, si2168_select, si2168_deselect); client, 0, 0, 0, si2168_select, si2168_deselect);
if (dev->adapter == NULL) { if (dev->adapter == NULL) {
ret = -ENODEV; ret = -ENODEV;
goto err; goto err;
...@@ -697,7 +704,7 @@ static int si2168_probe(struct i2c_client *client, ...@@ -697,7 +704,7 @@ static int si2168_probe(struct i2c_client *client,
/* create dvb_frontend */ /* create dvb_frontend */
memcpy(&dev->fe.ops, &si2168_ops, sizeof(struct dvb_frontend_ops)); memcpy(&dev->fe.ops, &si2168_ops, sizeof(struct dvb_frontend_ops));
dev->fe.demodulator_priv = dev; dev->fe.demodulator_priv = client;
*config->i2c_adapter = dev->adapter; *config->i2c_adapter = dev->adapter;
*config->fe = &dev->fe; *config->fe = &dev->fe;
......
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