diff options
| author | Michael Krufky <mkrufky@linuxtv.org> | 2008-06-28 19:27:19 -0400 |
|---|---|---|
| committer | Michael Krufky <mkrufky@linuxtv.org> | 2008-06-28 19:27:19 -0400 |
| commit | d5adaf8e55c09e9cdbebdf118f9245a012d04650 (patch) | |
| tree | 977075d4faa20a0fd280e48926029d454b27eaea | |
| parent | 6a92e20d0639ce172f0c7c28476a6c2b0d545ae5 (diff) | |
| download | mediapointer-dvb-s2-d5adaf8e55c09e9cdbebdf118f9245a012d04650.tar.gz mediapointer-dvb-s2-d5adaf8e55c09e9cdbebdf118f9245a012d04650.tar.bz2 | |
sms1xxx: log firmware download process by default
From: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
| -rw-r--r-- | linux/drivers/media/dvb/siano/smscoreapi.c | 14 | ||||
| -rw-r--r-- | linux/drivers/media/dvb/siano/smscoreapi.h | 4 |
2 files changed, 11 insertions, 7 deletions
diff --git a/linux/drivers/media/dvb/siano/smscoreapi.c b/linux/drivers/media/dvb/siano/smscoreapi.c index 73084f795..24de12f35 100644 --- a/linux/drivers/media/dvb/siano/smscoreapi.c +++ b/linux/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/linux/drivers/media/dvb/siano/smscoreapi.h b/linux/drivers/media/dvb/siano/smscoreapi.h index 78afcc913..ffac3fd09 100644 --- a/linux/drivers/media/dvb/siano/smscoreapi.h +++ b/linux/drivers/media/dvb/siano/smscoreapi.h @@ -591,10 +591,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...) \ |