From: tip-bot for Kuppuswamy Sathyanarayanan <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@kernel.org,
david.a.cohen@linux.intel.com,
sathyanarayanan.kuppuswamy@linux.intel.com, tglx@linutronix.de,
hpa@linux.intel.com
Subject: [tip:x86/intel-mid] mrst: Fixed printk/pr_* related issues
Date: Thu, 17 Oct 2013 17:33:28 -0700 [thread overview]
Message-ID: <tip-001d4c7aea587ce0865c07ec45aa56ecbefd431a@git.kernel.org> (raw)
In-Reply-To: <1382049336-21316-2-git-send-email-david.a.cohen@linux.intel.com>
Commit-ID: 001d4c7aea587ce0865c07ec45aa56ecbefd431a
Gitweb: http://git.kernel.org/tip/001d4c7aea587ce0865c07ec45aa56ecbefd431a
Author: Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com>
AuthorDate: Thu, 17 Oct 2013 15:35:25 -0700
Committer: H. Peter Anvin <hpa@linux.intel.com>
CommitDate: Thu, 17 Oct 2013 16:40:33 -0700
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>
---
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;
}
next prev parent reply other threads:[~2013-10-18 0:33 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-17 22:35 [PATCH v10 00/12] rework arch/x86/platform/[mrst => intel-mid] David Cohen
2013-10-17 22:35 ` [PATCH v10 01/12] mrst: Fixed printk/pr_* related issues David Cohen
2013-10-18 0:33 ` tip-bot for Kuppuswamy Sathyanarayanan [this message]
2013-10-17 22:35 ` [PATCH v10 02/12] mrst: Fixed indentation issues David Cohen
2013-10-18 0:33 ` [tip:x86/intel-mid] " tip-bot for Kuppuswamy Sathyanarayanan
2013-10-17 22:35 ` [PATCH v10 03/12] intel_mid: Renamed *mrst* to *intel_mid* David Cohen
2013-10-18 0:33 ` [tip:x86/intel-mid] " tip-bot for Kuppuswamy Sathyanarayanan
2013-10-17 22:35 ` [PATCH v10 04/12] pci: intel_mid: return true/false in function returning bool David Cohen
2013-10-18 0:33 ` [tip:x86/intel-mid] pci: intel_mid: Return true/ false " tip-bot for Fengguang Wu
2013-10-17 22:35 ` [PATCH v10 05/12] intel_mid: Renamed *mrst* to *intel_mid* David Cohen
2013-10-18 0:34 ` [tip:x86/intel-mid] " tip-bot for Kuppuswamy Sathyanarayanan
2013-10-17 22:35 ` [PATCH v10 06/12] intel_mid: Refactored sfi_parse_devs() function David Cohen
2013-10-18 0:34 ` [tip:x86/intel-mid] " tip-bot for Kuppuswamy Sathyanarayanan
2013-10-17 22:35 ` [PATCH v10 07/12] intel_mid: Added custom device_handler support David Cohen
2013-10-18 0:34 ` [tip:x86/intel-mid] " tip-bot for Kuppuswamy Sathyanarayanan
2013-10-17 22:35 ` [PATCH v10 08/12] intel_mid: Added custom handler for ipc devices David Cohen
2013-10-18 0:34 ` [tip:x86/intel-mid] " tip-bot for Kuppuswamy Sathyanarayanan
2013-10-17 22:35 ` [PATCH v10 09/12] intel_mid: Moved SFI related code to sfi.c David Cohen
2013-10-18 0:34 ` [tip:x86/intel-mid] " tip-bot for Kuppuswamy Sathyanarayanan
2013-10-17 22:35 ` [PATCH v10 10/12] intel-mid: sfi: allow struct devs_id.get_platform_data to be NULL David Cohen
2013-10-18 0:34 ` [tip:x86/intel-mid] intel-mid: sfi: Allow " tip-bot for David Cohen
2013-10-17 22:35 ` [PATCH v10 11/12] x86: intel-mid: add section for sfi device table David Cohen
2013-10-18 0:35 ` [tip:x86/intel-mid] x86: intel-mid: Add " tip-bot for David Cohen
2013-10-17 22:35 ` [PATCH v10 12/12] intel_mid: move board related codes to their own platform_<device>.* files David Cohen
2013-10-18 0:35 ` [tip:x86/intel-mid] intel_mid: Move platform device setups " tip-bot for David Cohen
2013-10-18 6:09 ` [PATCH v10 00/12] rework arch/x86/platform/[mrst => intel-mid] Ingo Molnar
2013-10-18 13:39 ` David Cohen
-- strict thread matches above, loose matches on Subject: below --
2013-10-16 4:11 [PATCH v5 01/12] mrst: Fixed printk/pr_* related issues David Cohen
2013-10-17 18:18 ` [tip:x86/intel-mid] " tip-bot for Kuppuswamy Sathyanarayanan
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=tip-001d4c7aea587ce0865c07ec45aa56ecbefd431a@git.kernel.org \
--to=tipbot@zytor.com \
--cc=david.a.cohen@linux.intel.com \
--cc=hpa@linux.intel.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=sathyanarayanan.kuppuswamy@linux.intel.com \
--cc=tglx@linutronix.de \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox