aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntti Palosaari <crope@iki.fi>2014-12-06 15:43:27 -0500
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2015-01-29 15:45:36 -0500
commit9b7839c3061cfc4f9087c2ad67d56e844d087c55 (patch)
treeced2433353547e3cbfc81ffd253c7604facaa830
parent58f6693fa1bfe97a40e3ba5e2271893b1074f161 (diff)
[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>
-rw-r--r--drivers/media/dvb-frontends/si2168.c12
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)
414 fw_file = SI2168_B40_FIRMWARE; 414 fw_file = SI2168_B40_FIRMWARE;
415 break; 415 break;
416 default: 416 default:
417 dev_err(&client->dev, 417 dev_err(&client->dev, "unknown chip version Si21%d-%c%c%c\n",
418 "unknown chip version Si21%d-%c%c%c\n",
419 cmd.args[2], cmd.args[1], 418 cmd.args[2], cmd.args[1],
420 cmd.args[3], cmd.args[4]); 419 cmd.args[3], cmd.args[4]);
421 ret = -EINVAL; 420 ret = -EINVAL;
422 goto err; 421 goto err;
423 } 422 }
424 423
425 /* cold state - try to download firmware */ 424 dev_info(&client->dev, "found a 'Silicon Labs Si21%d-%c%c%c'\n",
426 dev_info(&client->dev, "found a '%s' in cold state\n", 425 cmd.args[2], cmd.args[1], cmd.args[3], cmd.args[4]);
427 si2168_ops.info.name);
428 426
429 /* request the firmware, this will block and timeout */ 427 /* request the firmware, this will block and timeout */
430 ret = request_firmware(&fw, fw_file, &client->dev); 428 ret = request_firmware(&fw, fw_file, &client->dev);
@@ -512,13 +510,11 @@ static int si2168_init(struct dvb_frontend *fe)
512 goto err; 510 goto err;
513 511
514 dev->fw_loaded = true; 512 dev->fw_loaded = true;
515
516 dev_info(&client->dev, "found a '%s' in warm state\n",
517 si2168_ops.info.name);
518warm: 513warm:
519 dev->active = true; 514 dev->active = true;
520 515
521 return 0; 516 return 0;
517
522err_release_firmware: 518err_release_firmware:
523 release_firmware(fw); 519 release_firmware(fw);
524err: 520err: