OSDN Git Service

[media] si2168: print chip version
authorAntti Palosaari <crope@iki.fi>
Sat, 6 Dec 2014 20:43:27 +0000 (17:43 -0300)
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>
Thu, 29 Jan 2015 20:45:36 +0000 (18:45 -0200)
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>
drivers/media/dvb-frontends/si2168.c

index 766362e..25fe63a 100644 (file)
@@ -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: