V4L/DVB (8306): sms1xxx: log firmware download process by default

Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

2 files changed, 11 insertions, 7 deletions

diff --git a/drivers/media/dvb/siano/smscoreapi.c b/drivers/media/dvb/siano/smscoreapi.c
index c54c7180e39e..1dd196600036 100644
--- a/drivers/media/dvb/siano/smscoreapi.c
+++ b/drivers/media/dvb/siano/smscoreapi.c
@@ -791,19 +791,23 @@ int smscore_set_device_mode(struct smscore_device_t *coredev, int mode)
                         rc = smscore_load_firmware_from_file(coredev,
                                                              fw_filename, NULL);
                         if (rc < 0) {
-                                sms_err("error %d loading firmware: %s, "
-                                        "trying again with default firmware",
-                                        rc, fw_filename);
+                                sms_warn("error %d loading firmware: %s, "
+                                         "trying again with default firmware",
+                                         rc, fw_filename);
 
                                 /* try again with the default firmware */
+                                fw_filename = smscore_fw_lkup[mode][type];
                                 rc = smscore_load_firmware_from_file(coredev,
-                                        smscore_fw_lkup[mode][type], NULL);
+                                                             fw_filename, NULL);
 
                                 if (rc < 0) {
-                                        sms_err("load firmware failed %d", rc);
+                                        sms_warn("error %d loading "
+                                                 "firmware: %s", rc,
+                                                 fw_filename);
                                         return rc;
                                 }
                         }
+                        sms_log("firmware download success: %s", fw_filename);
                 } else
                         sms_info("mode %d supported by running "
                                  "firmware", mode);
diff --git a/drivers/media/dvb/siano/smscoreapi.h b/drivers/media/dvb/siano/smscoreapi.h
index 3e4e7dbc54da..c1f56900b3ea 100644
--- a/drivers/media/dvb/siano/smscoreapi.h
+++ b/drivers/media/dvb/siano/smscoreapi.h
@@ -421,10 +421,10 @@ extern int sms_debug;
         if (sms_debug & lvl) \
                 sms_printk(kern, fmt, ##arg); } while (0)
 
+#define sms_log(fmt, arg...) sms_printk(KERN_INFO, fmt, ##arg)
 #define sms_err(fmt, arg...) \
         sms_printk(KERN_ERR, "line: %d: " fmt, __LINE__, ##arg)
-#define sms_warn(fmt, arg...) \
-        sms_printk(KERN_WARNING, "line: %d: " fmt, __LINE__, ##arg)
+#define sms_warn(fmt, arg...)  sms_printk(KERN_WARNING, fmt, ##arg)
 #define sms_info(fmt, arg...) \
         dprintk(KERN_INFO, DBG_INFO, fmt, ##arg)
 #define sms_debug(fmt, arg...) \