From: tip-bot for Fabian Frederick <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: fabf@skynet.be, hpa@linux.intel.com, hpa@zytor.com,
linux-kernel@vger.kernel.org, tglx@linutronix.de,
mingo@kernel.org
Subject: [tip:x86/cleanups] x86, msr: Convert printk to pr_foo()
Date: Fri, 17 Oct 2014 13:47:13 -0700 [thread overview]
Message-ID: <tip-951a18c6fee5d2f6f5d7b5118776bf787bf9c351@git.kernel.org> (raw)
In-Reply-To: <1413576110-27103-1-git-send-email-fabf@skynet.be>
Commit-ID: 951a18c6fee5d2f6f5d7b5118776bf787bf9c351
Gitweb: http://git.kernel.org/tip/951a18c6fee5d2f6f5d7b5118776bf787bf9c351
Author: Fabian Frederick <fabf@skynet.be>
AuthorDate: Fri, 17 Oct 2014 22:01:50 +0200
Committer: H. Peter Anvin <hpa@linux.intel.com>
CommitDate: Fri, 17 Oct 2014 13:40:54 -0700
x86, msr: Convert printk to pr_foo()
Also define pr_fmt.
Signed-off-by: Fabian Frederick <fabf@skynet.be>
Link: http://lkml.kernel.org/r/1413576110-27103-1-git-send-email-fabf@skynet.be
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
---
arch/x86/kernel/msr.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/arch/x86/kernel/msr.c b/arch/x86/kernel/msr.c
index 6e4f77f..826c8b0 100644
--- a/arch/x86/kernel/msr.c
+++ b/arch/x86/kernel/msr.c
@@ -22,6 +22,8 @@
* an SMP box will direct the access to CPU %d.
*/
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
#include <linux/module.h>
#include <linux/types.h>
@@ -248,8 +250,7 @@ static int __init msr_init(void)
i = 0;
if (__register_chrdev(MSR_MAJOR, 0, NR_CPUS, "cpu/msr", &msr_fops)) {
- printk(KERN_ERR "msr: unable to get major %d for msr\n",
- MSR_MAJOR);
+ pr_err("unable to get major %d for msr\n", MSR_MAJOR);
err = -EBUSY;
goto out;
}
prev parent reply other threads:[~2014-10-17 20:47 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-17 20:01 [PATCH 3/4 linux-next] x86, msr: convert printk to pr_foo() Fabian Frederick
2014-10-17 20:47 ` tip-bot for Fabian Frederick [this message]
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-951a18c6fee5d2f6f5d7b5118776bf787bf9c351@git.kernel.org \
--to=tipbot@zytor.com \
--cc=fabf@skynet.be \
--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=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;
as well as URLs for NNTP newsgroup(s).