diff options
| author |   Antti Palosaari <crope@iki.fi> | 2014-12-06 17:43:27 -0300 |
|---|---|---|
| committer |   Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2015-01-29 18:45:36 -0200 |
| commit | 9b7839c3061cfc4f9087c2ad67d56e844d087c55 (patch) | |
| tree | ced2433353547e3cbfc81ffd253c7604facaa830 /drivers/media/dvb-frontends/si2168.c | |
| parent | [media] si2168: remove unneeded fw variable initialization (diff) | |
| download | linux-dev-9b7839c3061cfc4f9087c2ad67d56e844d087c55.tar.xz linux-dev-9b7839c3061cfc4f9087c2ad67d56e844d087c55.zip | |
[media] si2168: print chip version
Print chip version once using log level into when init() is called.
Remove cold/warm state printing as those are not very useful.
old printing:
si2168 6-0064: found a 'Silicon Labs Si2168' in cold state
si2168 6-0064: downloading firmware from file 'dvb-demod-si2168-b40-01.fw'
si2168 6-0064: firmware version: 4.0.11
si2168 6-0064: found a 'Silicon Labs Si2168' in warm state
new printing:
si2168 6-0064: found a 'Silicon Labs Si2168-B40'
si2168 6-0064: downloading firmware from file 'dvb-demod-si2168-b40-01.fw'
si2168 6-0064: firmware version: 4.0.11
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 | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/drivers/media/dvb-frontends/si2168.c b/drivers/media/dvb-frontends/si2168.c index 766362ed6b52..25fe63a2fb1f 100644 --- a/drivers/media/dvb-frontends/si2168.c +++ b/drivers/media/dvb-frontends/si2168.c @@ -414,17 +414,15 @@ static int si2168_init(struct dvb_frontend *fe) fw_file = SI2168_B40_FIRMWARE; break; default: - dev_err(&client->dev, - "unknown chip version Si21%d-%c%c%c\n", + dev_err(&client->dev, "unknown chip version Si21%d-%c%c%c\n", cmd.args[2], cmd.args[1], cmd.args[3], cmd.args[4]); ret = -EINVAL; goto err; } - /* cold state - try to download firmware */ - dev_info(&client->dev, "found a '%s' in cold state\n", - si2168_ops.info.name); + dev_info(&client->dev, "found a 'Silicon Labs Si21%d-%c%c%c'\n", + 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); @@ -512,13 +510,11 @@ static int si2168_init(struct dvb_frontend *fe) goto err; dev->fw_loaded = true; - - dev_info(&client->dev, "found a '%s' in warm state\n", - si2168_ops.info.name); warm: dev->active = true; return 0; + err_release_firmware: release_firmware(fw); err: |