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>

diff --git a/drivers/rtc/hctosys.c b/drivers/rtc/hctosys.c
index 91fb5f3c1051e6dbcfcedb54436ee97361a0a5eb..e1cfa06810ef275704ab887935b39ca438ae5c3a 100644 (file)
--- a/drivers/rtc/hctosys.c
+++ b/drivers/rtc/hctosys.c
@@ -9,6 +9,8 @@
  * published by the Free Software Foundation.
 */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/rtc.h>
 
 /* IMPORTANT: the RTC only stores whole seconds. It is arbitrary
@@ -32,8 +34,8 @@ static int __init rtc_hctosys(void)
        struct rtc_device *rtc = rtc_class_open(CONFIG_RTC_HCTOSYS_DEVICE);
 
        if (rtc == NULL) {
-               pr_info("%s: unable to open rtc device (%s)\n",
-                       __func__, CONFIG_RTC_HCTOSYS_DEVICE);
+               pr_info("unable to open rtc device (%s)\n",
+                       CONFIG_RTC_HCTOSYS_DEVICE);
                goto err_open;
        }
 

diff --git a/drivers/rtc/rtc-cmos.c b/drivers/rtc/rtc-cmos.c
index 87647f4591985195785ad49c662ea9ab02a88112..a82556a0757a2f18fe1b96201cdf601c3d867e51 100644 (file)
--- a/drivers/rtc/rtc-cmos.c
+++ b/drivers/rtc/rtc-cmos.c
@@ -28,6 +28,9 @@
  * interrupts disabled, holding the global rtc_lock, to exclude those
  * other drivers and utilities on correctly configured systems.
  */
+
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/init.h>
@@ -385,8 +388,7 @@ static bool alarm_disable_quirk;
 static int __init set_alarm_disable_quirk(const struct dmi_system_id *id)
 {
        alarm_disable_quirk = true;
-       pr_info("rtc-cmos: BIOS has alarm-disable quirk. ");
-       pr_info("RTC alarms disabled\n");
+       pr_info("BIOS has alarm-disable quirk - RTC alarms disabled\n");
        return 0;
 }
 

diff --git a/drivers/rtc/rtc-ds1374.c b/drivers/rtc/rtc-ds1374.c
index 8605fde394b2afdb61a18ede4062b4079c5aee1f..167783fa7ac125238e88e4cc1e0ec5b3a114aba9 100644 (file)
--- a/drivers/rtc/rtc-ds1374.c
+++ b/drivers/rtc/rtc-ds1374.c
@@ -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();
                }

diff --cc drivers/rtc/rtc-ds1685.c
Simple merge

diff --cc drivers/rtc/rtc-ds3232.c
Simple merge

diff --cc drivers/rtc/rtc-efi-platform.c
Simple merge

diff --cc drivers/rtc/rtc-m41t80.c
Simple merge

diff --cc drivers/rtc/rtc-max77686.c
Simple merge

diff --cc drivers/rtc/rtc-max8997.c
Simple merge

diff --cc drivers/rtc/rtc-msm6242.c
Simple merge

diff --cc drivers/rtc/rtc-opal.c
Simple merge

diff --cc drivers/rtc/rtc-s5m.c
Simple merge

diff --cc drivers/rtc/rtc-twl.c
Simple merge