From: David Cohen <david.a.cohen@linux.intel.com>
To: tglx@linutronix.de, mingo@redhat.com, hpa@zytor.com
Cc: linux-kernel@vger.kernel.org, x86@kernel.org,
platform-driver-x86@vger.kernel.org,
Kuppuswamy Sathyanarayanan
<sathyanarayanan.kuppuswamy@linux.intel.com>,
David Cohen <david.a.cohen@linux.intel.com>
Subject: [PATCH v3 01/10] mrst: Fixed printk/pr_* related issues
Date: Fri, 11 Oct 2013 20:43:15 -0700 [thread overview]
Message-ID: <1381549404-22594-2-git-send-email-david.a.cohen@linux.intel.com> (raw)
In-Reply-To: <1381549404-22594-1-git-send-email-david.a.cohen@linux.intel.com>
From: Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com>
Fixed printk and pr_* related issues in mrst related files.
Signed-off-by: Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com>
Signed-off-by: David Cohen <david.a.cohen@linux.intel.com>
---
arch/x86/platform/mrst/early_printk_mrst.c | 2 +-
arch/x86/platform/mrst/mrst.c | 2 +-
arch/x86/platform/mrst/vrtc.c | 5 ++---
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 028454f..95880f7 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 3ca5957..b9aeb54 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 5e355b1..ca4f7d9 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;
}
--
1.8.4.rc3
next prev parent reply other threads:[~2013-10-12 3:39 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-12 3:43 [PATCH v3 00/10] rework arch/x86/platform/[mrst => intel-mid] David Cohen
2013-10-12 3:43 ` David Cohen [this message]
2013-10-12 3:43 ` [PATCH v3 02/10] mrst: Fixed indentation issues David Cohen
2013-10-12 3:43 ` [PATCH v3 03/10] mrst: Fixed checkpatch warnings David Cohen
2013-10-12 3:43 ` [PATCH v3 04/10] intel_mid: Renamed *mrst* to *intel_mid* David Cohen
2013-10-12 3:43 ` [PATCH v3 05/10] " David Cohen
2013-10-12 3:43 ` [PATCH v3 06/10] intel_mid: Refactored sfi_parse_devs() function David Cohen
2013-10-12 3:43 ` [PATCH v3 07/10] intel_mid: Added custom device_handler support David Cohen
2013-10-14 16:03 ` H. Peter Anvin
2013-10-14 16:16 ` Joe Perches
2013-10-14 16:30 ` H. Peter Anvin
2013-10-14 16:32 ` David Cohen
2013-10-14 16:30 ` H. Peter Anvin
2013-10-14 16:40 ` David Cohen
2013-10-12 3:43 ` [PATCH v3 08/10] intel_mid: Added custom handler for ipc devices David Cohen
2013-10-14 16:04 ` H. Peter Anvin
2013-10-14 16:33 ` David Cohen
2013-10-12 3:43 ` [PATCH v3 09/10] intel_mid: Moved board related code to a new file David Cohen
2013-10-12 3:43 ` [PATCH v3 10/10] intel_mid: Moved SFI related code to intel_mid_sfi.c David Cohen
2013-10-14 16:38 ` H. Peter Anvin
2013-10-14 16:47 ` David Cohen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1381549404-22594-2-git-send-email-david.a.cohen@linux.intel.com \
--to=david.a.cohen@linux.intel.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=platform-driver-x86@vger.kernel.org \
--cc=sathyanarayanan.kuppuswamy@linux.intel.com \
--cc=tglx@linutronix.de \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.