mrst: Fixed printk/pr_* related issues

Fixed printk and pr_* related issues in mrst related files.

Signed-off-by: Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com>
Link: http://lkml.kernel.org/r/1382049336-21316-2-git-send-email-david.a.cohen@linux.intel.com
Signed-off-by: David Cohen <david.a.cohen@linux.intel.com>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>

3 files changed, 4 insertions, 5 deletions

diff --git a/arch/x86/platform/mrst/early_printk_mrst.c b/arch/x86/platform/mrst/early_printk_mrst.c
index 028454f0c3a5..95880f7f34de 100644
--- a/arch/x86/platform/mrst/early_printk_mrst.c
+++ b/arch/x86/platform/mrst/early_printk_mrst.c
@@ -213,7 +213,7 @@ static void early_mrst_spi_putc(char c)
         }
 
         if (!timeout)
-                pr_warning("MRST earlycon: timed out\n");
+                pr_warn("MRST earlycon: timed out\n");
         else
                 max3110_write_data(c);
 }
diff --git a/arch/x86/platform/mrst/mrst.c b/arch/x86/platform/mrst/mrst.c
index 3ca5957b7a34..b9aeb5464d82 100644
--- a/arch/x86/platform/mrst/mrst.c
+++ b/arch/x86/platform/mrst/mrst.c
@@ -328,7 +328,7 @@ static inline int __init setup_x86_mrst_timer(char *arg)
         else if (strcmp("lapic_and_apbt", arg) == 0)
                 mrst_timer_options = MRST_TIMER_LAPIC_APBT;
         else {
-                pr_warning("X86 MRST timer option %s not recognised"
+                pr_warn("X86 MRST timer option %s not recognised"
                            " use x86_mrst_timer=apbt_only or lapic_and_apbt\n",
                            arg);
                 return -EINVAL;
diff --git a/arch/x86/platform/mrst/vrtc.c b/arch/x86/platform/mrst/vrtc.c
index 5e355b134ba4..ca4f7d999fd1 100644
--- a/arch/x86/platform/mrst/vrtc.c
+++ b/arch/x86/platform/mrst/vrtc.c
@@ -79,7 +79,7 @@ void vrtc_get_time(struct timespec *now)
         /* vRTC YEAR reg contains the offset to 1972 */
         year += 1972;
 
-        printk(KERN_INFO "vRTC: sec: %d min: %d hour: %d day: %d "
+        pr_info("vRTC: sec: %d min: %d hour: %d day: %d "
                 "mon: %d year: %d\n", sec, min, hour, mday, mon, year);
 
         now->tv_sec = mktime(year, mon, mday, hour, min, sec);
@@ -109,8 +109,7 @@ int vrtc_set_mmss(const struct timespec *now)
                 vrtc_cmos_write(tm.tm_sec, RTC_SECONDS);
                 spin_unlock_irqrestore(&rtc_lock, flags);
         } else {
-                printk(KERN_ERR
-                       "%s: Invalid vRTC value: write of %lx to vRTC failed\n",
+                pr_err("%s: Invalid vRTC value: write of %lx to vRTC failed\n",
                         __FUNCTION__, now->tv_sec);
                 retval = -EINVAL;
         }