diff options
| author | Antti Palosaari <crope@iki.fi> | 2014-12-06 17:53:16 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2015-01-29 18:46:05 -0200 |
| commit | c32b281628bec1a02b7847e9e14e0b9556a17f74 (patch) | |
| tree | 5d17e45f5c608071d0550fcae04c8c6eed0629e8 /drivers/media/dvb-frontends/si2168.c | |
| parent | 9b7839c3061cfc4f9087c2ad67d56e844d087c55 (diff) | |
| download | blackbird-obmc-linux-c32b281628bec1a02b7847e9e14e0b9556a17f74.tar.gz blackbird-obmc-linux-c32b281628bec1a02b7847e9e14e0b9556a17f74.zip | |
[media] si2168: change firmware variable name and type
Rename firmware variable from fw_file to fw_name and change its type
from u8 to const char as request_firmware() input defines.
Signed-off-by: Antti Palosaari <crope@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/media/dvb-frontends/si2168.c')
| -rw-r--r-- | drivers/media/dvb-frontends/si2168.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/media/dvb-frontends/si2168.c b/drivers/media/dvb-frontends/si2168.c index 25fe63a2fb1f..63341f485f9f 100644 --- a/drivers/media/dvb-frontends/si2168.c +++ b/drivers/media/dvb-frontends/si2168.c @@ -347,7 +347,7 @@ static int si2168_init(struct dvb_frontend *fe) struct si2168_dev *dev = i2c_get_clientdata(client); int ret, len, remaining; const struct firmware *fw; - u8 *fw_file; + const char *fw_name; struct si2168_cmd cmd; unsigned int chip_id; @@ -405,13 +405,13 @@ static int si2168_init(struct dvb_frontend *fe) switch (chip_id) { case SI2168_A20: - fw_file = SI2168_A20_FIRMWARE; + fw_name = SI2168_A20_FIRMWARE; break; case SI2168_A30: - fw_file = SI2168_A30_FIRMWARE; + fw_name = SI2168_A30_FIRMWARE; break; case SI2168_B40: - fw_file = SI2168_B40_FIRMWARE; + fw_name = SI2168_B40_FIRMWARE; break; default: dev_err(&client->dev, "unknown chip version Si21%d-%c%c%c\n", @@ -425,12 +425,12 @@ static int si2168_init(struct dvb_frontend *fe) cmd.args[2], cmd.args[1], cmd.args[3], cmd.args[4]); /* request the firmware, this will block and timeout */ - ret = request_firmware(&fw, fw_file, &client->dev); + ret = request_firmware(&fw, fw_name, &client->dev); if (ret) { /* fallback mechanism to handle old name for Si2168 B40 fw */ if (chip_id == SI2168_B40) { - fw_file = SI2168_B40_FIRMWARE_FALLBACK; - ret = request_firmware(&fw, fw_file, &client->dev); + fw_name = SI2168_B40_FIRMWARE_FALLBACK; + ret = request_firmware(&fw, fw_name, &client->dev); } if (ret == 0) { @@ -440,13 +440,13 @@ static int si2168_init(struct dvb_frontend *fe) } else { dev_err(&client->dev, "firmware file '%s' not found\n", - fw_file); + fw_name); goto err_release_firmware; } } dev_info(&client->dev, "downloading firmware from file '%s'\n", - fw_file); + fw_name); if ((fw->size % 17 == 0) && (fw->data[0] > 5)) { /* firmware is in the new format */ |
