system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-10-28 06:09:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

[media] si2157: rename device state variable from 's' to 'dev'

Browse source 
'dev' is likely most common name in kernel for structure containing
device state instance, so rename it in order to keep things
consistent.

Signed-off-by: Antti Palosaari <crope@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
This commit is contained in:
Antti Palosaari 2014-12-05 17:46:30 -03:00 committed by Mauro Carvalho Chehab
parent c32b281628
commit 70f13ff091
2 changed files with 59 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

118
drivers/media/tuners/si2157.c
View file

@ -19,16 +19,16 @@
static const struct dvb_tuner_ops si2157_ops; static const struct dvb_tuner_ops si2157_ops;
/* execute firmware command */ /* execute firmware command */
static int si2157_cmd_execute(struct si2157 *s, struct si2157_cmd *cmd) static int si2157_cmd_execute(struct si2157_dev *dev, struct si2157_cmd *cmd)
{ {
int ret; int ret;
unsigned long timeout; unsigned long timeout;
mutex_lock(&s->i2c_mutex); mutex_lock(&dev->i2c_mutex);
if (cmd->wlen) { if (cmd->wlen) {
/* write cmd and args for firmware */ /* write cmd and args for firmware */
ret = i2c_master_send(s->client, cmd->args, cmd->wlen); ret = i2c_master_send(dev->client, cmd->args, cmd->wlen);
if (ret < 0) { if (ret < 0) {
goto err_mutex_unlock; goto err_mutex_unlock;
} else if (ret != cmd->wlen) { } else if (ret != cmd->wlen) {
@ -42,7 +42,7 @@ static int si2157_cmd_execute(struct si2157 *s, struct si2157_cmd *cmd)
#define TIMEOUT 80 #define TIMEOUT 80
timeout = jiffies + msecs_to_jiffies(TIMEOUT); timeout = jiffies + msecs_to_jiffies(TIMEOUT);
while (!time_after(jiffies, timeout)) { while (!time_after(jiffies, timeout)) {
ret = i2c_master_recv(s->client, cmd->args, cmd->rlen); ret = i2c_master_recv(dev->client, cmd->args, cmd->rlen);
if (ret < 0) { if (ret < 0) {
goto err_mutex_unlock; goto err_mutex_unlock;
} else if (ret != cmd->rlen) { } else if (ret != cmd->rlen) {
@ -55,7 +55,7 @@ static int si2157_cmd_execute(struct si2157 *s, struct si2157_cmd *cmd)
break; break;
} }
dev_dbg(&s->client->dev, "cmd execution took %d ms\n", dev_dbg(&dev->client->dev, "cmd execution took %d ms\n",
jiffies_to_msecs(jiffies) - jiffies_to_msecs(jiffies) -
(jiffies_to_msecs(timeout) - TIMEOUT)); (jiffies_to_msecs(timeout) - TIMEOUT));
@ -68,32 +68,32 @@ static int si2157_cmd_execute(struct si2157 *s, struct si2157_cmd *cmd)
ret = 0; ret = 0;
err_mutex_unlock: err_mutex_unlock:
mutex_unlock(&s->i2c_mutex); mutex_unlock(&dev->i2c_mutex);
if (ret) if (ret)
goto err; goto err;
return 0; return 0;
err: err:
dev_dbg(&s->client->dev, "failed=%d\n", ret); dev_dbg(&dev->client->dev, "failed=%d\n", ret);
return ret; return ret;
} }
static int si2157_init(struct dvb_frontend *fe) static int si2157_init(struct dvb_frontend *fe)
{ {
struct si2157 *s = fe->tuner_priv; struct si2157_dev *dev = fe->tuner_priv;
int ret, len, remaining; int ret, len, remaining;
struct si2157_cmd cmd; struct si2157_cmd cmd;
const struct firmware *fw = NULL; const struct firmware *fw = NULL;
u8 *fw_file; u8 *fw_file;
unsigned int chip_id; unsigned int chip_id;
dev_dbg(&s->client->dev, "\n"); dev_dbg(&dev->client->dev, "\n");
if (s->fw_loaded) if (dev->fw_loaded)
goto warm; goto warm;
/* power up */ /* power up */
if (s->chiptype == SI2157_CHIPTYPE_SI2146) { if (dev->chiptype == SI2157_CHIPTYPE_SI2146) {
memcpy(cmd.args, "\xc0\x05\x01\x00\x00\x0b\x00\x00\x01", 9); memcpy(cmd.args, "\xc0\x05\x01\x00\x00\x0b\x00\x00\x01", 9);
cmd.wlen = 9; cmd.wlen = 9;
} else { } else {
@ -101,7 +101,7 @@ static int si2157_init(struct dvb_frontend *fe)
cmd.wlen = 15; cmd.wlen = 15;
} }
cmd.rlen = 1; cmd.rlen = 1;
ret = si2157_cmd_execute(s, &cmd); ret = si2157_cmd_execute(dev, &cmd);
if (ret) if (ret)
goto err; goto err;
@ -109,7 +109,7 @@ static int si2157_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 = si2157_cmd_execute(s, &cmd); ret = si2157_cmd_execute(dev, &cmd);
if (ret) if (ret)
goto err; goto err;
@ -132,7 +132,7 @@ static int si2157_init(struct dvb_frontend *fe)
case SI2146_A10: case SI2146_A10:
goto skip_fw_download; goto skip_fw_download;
default: default:
dev_err(&s->client->dev, dev_err(&dev->client->dev,
"unknown chip version Si21%d-%c%c%c\n", "unknown chip version Si21%d-%c%c%c\n",
cmd.args[2], cmd.args[1], cmd.args[2], cmd.args[1],
cmd.args[3], cmd.args[4]); cmd.args[3], cmd.args[4]);
@ -141,26 +141,26 @@ static int si2157_init(struct dvb_frontend *fe)
} }
/* cold state - try to download firmware */ /* cold state - try to download firmware */
dev_info(&s->client->dev, "found a '%s' in cold state\n", dev_info(&dev->client->dev, "found a '%s' in cold state\n",
si2157_ops.info.name); si2157_ops.info.name);
/* request the firmware, this will block and timeout */ /* request the firmware, this will block and timeout */
ret = request_firmware(&fw, fw_file, &s->client->dev); ret = request_firmware(&fw, fw_file, &dev->client->dev);
if (ret) { if (ret) {
dev_err(&s->client->dev, "firmware file '%s' not found\n", dev_err(&dev->client->dev, "firmware file '%s' not found\n",
fw_file); fw_file);
goto err; goto err;
} }
/* firmware should be n chunks of 17 bytes */ /* firmware should be n chunks of 17 bytes */
if (fw->size % 17 != 0) { if (fw->size % 17 != 0) {
dev_err(&s->client->dev, "firmware file '%s' is invalid\n", dev_err(&dev->client->dev, "firmware file '%s' is invalid\n",
fw_file); fw_file);
ret = -EINVAL; ret = -EINVAL;
goto fw_release_exit; goto fw_release_exit;
} }
dev_info(&s->client->dev, "downloading firmware from file '%s'\n", dev_info(&dev->client->dev, "downloading firmware from file '%s'\n",
fw_file); fw_file);
for (remaining = fw->size; remaining > 0; remaining -= 17) { for (remaining = fw->size; remaining > 0; remaining -= 17) {
@ -168,9 +168,9 @@ static int si2157_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 = si2157_cmd_execute(s, &cmd); ret = si2157_cmd_execute(dev, &cmd);
if (ret) { if (ret) {
dev_err(&s->client->dev, dev_err(&dev->client->dev,
"firmware download failed=%d\n", "firmware download failed=%d\n",
ret); ret);
goto fw_release_exit; goto fw_release_exit;
@ -185,61 +185,61 @@ static int si2157_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 = si2157_cmd_execute(s, &cmd); ret = si2157_cmd_execute(dev, &cmd);
if (ret) if (ret)
goto err; goto err;
s->fw_loaded = true; dev->fw_loaded = true;
warm: warm:
s->active = true; dev->active = true;
return 0; return 0;
fw_release_exit: fw_release_exit:
release_firmware(fw); release_firmware(fw);
err: err:
dev_dbg(&s->client->dev, "failed=%d\n", ret); dev_dbg(&dev->client->dev, "failed=%d\n", ret);
return ret; return ret;
} }
static int si2157_sleep(struct dvb_frontend *fe) static int si2157_sleep(struct dvb_frontend *fe)
{ {
struct si2157 *s = fe->tuner_priv; struct si2157_dev *dev = fe->tuner_priv;
int ret; int ret;
struct si2157_cmd cmd; struct si2157_cmd cmd;
dev_dbg(&s->client->dev, "\n"); dev_dbg(&dev->client->dev, "\n");
s->active = false; dev->active = false;
/* standby */ /* standby */
memcpy(cmd.args, "\x16\x00", 2); memcpy(cmd.args, "\x16\x00", 2);
cmd.wlen = 2; cmd.wlen = 2;
cmd.rlen = 1; cmd.rlen = 1;
ret = si2157_cmd_execute(s, &cmd); ret = si2157_cmd_execute(dev, &cmd);
if (ret) if (ret)
goto err; goto err;
return 0; return 0;
err: err:
dev_dbg(&s->client->dev, "failed=%d\n", ret); dev_dbg(&dev->client->dev, "failed=%d\n", ret);
return ret; return ret;
} }
static int si2157_set_params(struct dvb_frontend *fe) static int si2157_set_params(struct dvb_frontend *fe)
{ {
struct si2157 *s = fe->tuner_priv; struct si2157_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; int ret;
struct si2157_cmd cmd; struct si2157_cmd cmd;
u8 bandwidth, delivery_system; u8 bandwidth, delivery_system;
dev_dbg(&s->client->dev, dev_dbg(&dev->client->dev,
"delivery_system=%d frequency=%u bandwidth_hz=%u\n", "delivery_system=%d frequency=%u bandwidth_hz=%u\n",
c->delivery_system, c->frequency, c->delivery_system, c->frequency,
c->bandwidth_hz); c->bandwidth_hz);
if (!s->active) { if (!dev->active) {
ret = -EAGAIN; ret = -EAGAIN;
goto err; goto err;
} }
@ -274,21 +274,21 @@ static int si2157_set_params(struct dvb_frontend *fe)
memcpy(cmd.args, "\x14\x00\x03\x07\x00\x00", 6); memcpy(cmd.args, "\x14\x00\x03\x07\x00\x00", 6);
cmd.args[4] = delivery_system | bandwidth; cmd.args[4] = delivery_system | bandwidth;
if (s->inversion) if (dev->inversion)
cmd.args[5] = 0x01; cmd.args[5] = 0x01;
cmd.wlen = 6; cmd.wlen = 6;
cmd.rlen = 4; cmd.rlen = 4;
ret = si2157_cmd_execute(s, &cmd); ret = si2157_cmd_execute(dev, &cmd);
if (ret) if (ret)
goto err; goto err;
if (s->chiptype == SI2157_CHIPTYPE_SI2146) if (dev->chiptype == SI2157_CHIPTYPE_SI2146)
memcpy(cmd.args, "\x14\x00\x02\x07\x00\x01", 6); memcpy(cmd.args, "\x14\x00\x02\x07\x00\x01", 6);
else else
memcpy(cmd.args, "\x14\x00\x02\x07\x01\x00", 6); memcpy(cmd.args, "\x14\x00\x02\x07\x01\x00", 6);
cmd.wlen = 6; cmd.wlen = 6;
cmd.rlen = 4; cmd.rlen = 4;
ret = si2157_cmd_execute(s, &cmd); ret = si2157_cmd_execute(dev, &cmd);
if (ret) if (ret)
goto err; goto err;
@ -300,13 +300,13 @@ static int si2157_set_params(struct dvb_frontend *fe)
cmd.args[7] = (c->frequency >> 24) & 0xff; cmd.args[7] = (c->frequency >> 24) & 0xff;
cmd.wlen = 8; cmd.wlen = 8;
cmd.rlen = 1; cmd.rlen = 1;
ret = si2157_cmd_execute(s, &cmd); ret = si2157_cmd_execute(dev, &cmd);
if (ret) if (ret)
goto err; goto err;
return 0; return 0;
err: err:
dev_dbg(&s->client->dev, "failed=%d\n", ret); dev_dbg(&dev->client->dev, "failed=%d\n", ret);
return ret; return ret;
} }
@ -334,60 +334,58 @@ static int si2157_probe(struct i2c_client *client,
{ {
struct si2157_config *cfg = client->dev.platform_data; struct si2157_config *cfg = client->dev.platform_data;
struct dvb_frontend *fe = cfg->fe; struct dvb_frontend *fe = cfg->fe;
struct si2157 *s; struct si2157_dev *dev;
struct si2157_cmd cmd; struct si2157_cmd cmd;
int ret; int ret;
s = kzalloc(sizeof(struct si2157), GFP_KERNEL); dev = kzalloc(sizeof(*dev), GFP_KERNEL);
if (!s) { if (!dev) {
ret = -ENOMEM; ret = -ENOMEM;
dev_err(&client->dev, "kzalloc() failed\n"); dev_err(&client->dev, "kzalloc() failed\n");
goto err; goto err;
} }
s->client = client; dev->client = client;
s->fe = cfg->fe; dev->fe = cfg->fe;
s->inversion = cfg->inversion; dev->inversion = cfg->inversion;
s->fw_loaded = false; dev->fw_loaded = false;
s->chiptype = (u8)id->driver_data; dev->chiptype = (u8)id->driver_data;
mutex_init(&s->i2c_mutex); mutex_init(&dev->i2c_mutex);
/* check if the tuner is there */ /* check if the tuner is there */
cmd.wlen = 0; cmd.wlen = 0;
cmd.rlen = 1; cmd.rlen = 1;
ret = si2157_cmd_execute(s, &cmd); ret = si2157_cmd_execute(dev, &cmd);
if (ret) if (ret)
goto err; goto err;
fe->tuner_priv = s; fe->tuner_priv = dev;
memcpy(&fe->ops.tuner_ops, &si2157_ops, memcpy(&fe->ops.tuner_ops, &si2157_ops, sizeof(struct dvb_tuner_ops));
sizeof(struct dvb_tuner_ops));
i2c_set_clientdata(client, s); i2c_set_clientdata(client, dev);
dev_info(&s->client->dev, dev_info(&dev->client->dev,
"Silicon Labs %s successfully attached\n", "Silicon Labs %s successfully attached\n",
s->chiptype == SI2157_CHIPTYPE_SI2146 ? dev->chiptype == SI2157_CHIPTYPE_SI2146 ?
"Si2146" : "Si2147/2148/2157/2158"); "Si2146" : "Si2147/2148/2157/2158");
return 0; return 0;
err: err:
dev_dbg(&client->dev, "failed=%d\n", ret); dev_dbg(&client->dev, "failed=%d\n", ret);
kfree(s); kfree(dev);
return ret; return ret;
} }
static int si2157_remove(struct i2c_client *client) static int si2157_remove(struct i2c_client *client)
{ {
struct si2157 *s = i2c_get_clientdata(client); struct si2157_dev *dev = i2c_get_clientdata(client);
struct dvb_frontend *fe = s->fe; struct dvb_frontend *fe = dev->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(s); kfree(dev);
return 0; return 0;
} }

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

@ -21,7 +21,7 @@
#include "si2157.h" #include "si2157.h"
/* state struct */ /* state struct */
struct si2157 { struct si2157_dev {
struct mutex i2c_mutex; struct mutex i2c_mutex;
struct i2c_client *client; struct i2c_client *client;
struct dvb_frontend *fe; struct dvb_frontend *fe;