rtc: use more standard kernel logging styles
Neaten the logging a bit by adding #define pr_fmt Miscellanea: o Remove __FILE__/__func__ uses o Coalesce formats adding missing spaces o Align arguments o (rtc-cmos) Integrated 2 consecutive messages Signed-off-by: Joe Perches <joe@perches.com> Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> Cc: Alessandro Zummo <a.zummo@towertech.it> Cc: Joshua Kinard <kumba@gentoo.org> Cc: Chanwoo Choi <cw00.choi@samsung.com> Reviewed-by: Krzysztof Kozlowski <k.kozlowski@samsung.com> Tested-by: Krzysztof Kozlowski <k.kozlowski@samsung.com> Cc: Aaro Koskinen <aaro.koskinen@iki.fi> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:

committed by
Linus Torvalds

parent
f539a8acf1
commit
a737e835e5
@@ -18,6 +18,8 @@
|
||||
* "Sending and receiving", using SMBus level communication is preferred.
|
||||
*/
|
||||
|
||||
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
|
||||
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/interrupt.h>
|
||||
@@ -406,7 +408,7 @@ static int ds1374_wdt_settimeout(unsigned int timeout)
|
||||
/* Set new watchdog time */
|
||||
ret = ds1374_write_rtc(save_client, timeout, DS1374_REG_WDALM0, 3);
|
||||
if (ret) {
|
||||
pr_info("rtc-ds1374 - couldn't set new watchdog time\n");
|
||||
pr_info("couldn't set new watchdog time\n");
|
||||
goto out;
|
||||
}
|
||||
|
||||
@@ -539,12 +541,12 @@ static long ds1374_wdt_ioctl(struct file *file, unsigned int cmd,
|
||||
return -EFAULT;
|
||||
|
||||
if (options & WDIOS_DISABLECARD) {
|
||||
pr_info("rtc-ds1374: disable watchdog\n");
|
||||
pr_info("disable watchdog\n");
|
||||
ds1374_wdt_disable();
|
||||
}
|
||||
|
||||
if (options & WDIOS_ENABLECARD) {
|
||||
pr_info("rtc-ds1374: enable watchdog\n");
|
||||
pr_info("enable watchdog\n");
|
||||
ds1374_wdt_settimeout(wdt_margin);
|
||||
ds1374_wdt_ping();
|
||||
}
|
||||
|
Reference in New Issue
Block a user