Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9b7839c3 authored by Antti Palosaari's avatar Antti Palosaari Committed by Mauro Carvalho Chehab
Browse files

[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: default avatarAntti Palosaari <crope@iki.fi>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent 58f6693f

drivers/media/dvb-frontends/si2168.c

+4 −8
Original line number Diff line number Diff line
@@ -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: