Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Kuppuswamy Sathyanarayanan and committed by
H. Peter Anvin
001d4c7a 61e6cfa8

+4 -5
+1 -1
arch/x86/platform/mrst/early_printk_mrst.c
··· 213 213 } 214 214 215 215 if (!timeout) 216 - pr_warning("MRST earlycon: timed out\n"); 216 + pr_warn("MRST earlycon: timed out\n"); 217 217 else 218 218 max3110_write_data(c); 219 219 }
+1 -1
arch/x86/platform/mrst/mrst.c
··· 328 328 else if (strcmp("lapic_and_apbt", arg) == 0) 329 329 mrst_timer_options = MRST_TIMER_LAPIC_APBT; 330 330 else { 331 - pr_warning("X86 MRST timer option %s not recognised" 331 + pr_warn("X86 MRST timer option %s not recognised" 332 332 " use x86_mrst_timer=apbt_only or lapic_and_apbt\n", 333 333 arg); 334 334 return -EINVAL;
+2 -3
arch/x86/platform/mrst/vrtc.c
··· 79 79 /* vRTC YEAR reg contains the offset to 1972 */ 80 80 year += 1972; 81 81 82 - printk(KERN_INFO "vRTC: sec: %d min: %d hour: %d day: %d " 82 + pr_info("vRTC: sec: %d min: %d hour: %d day: %d " 83 83 "mon: %d year: %d\n", sec, min, hour, mday, mon, year); 84 84 85 85 now->tv_sec = mktime(year, mon, mday, hour, min, sec); ··· 109 109 vrtc_cmos_write(tm.tm_sec, RTC_SECONDS); 110 110 spin_unlock_irqrestore(&rtc_lock, flags); 111 111 } else { 112 - printk(KERN_ERR 113 - "%s: Invalid vRTC value: write of %lx to vRTC failed\n", 112 + pr_err("%s: Invalid vRTC value: write of %lx to vRTC failed\n", 114 113 __FUNCTION__, now->tv_sec); 115 114 retval = -EINVAL; 116 115 }