[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <tip-951a18c6fee5d2f6f5d7b5118776bf787bf9c351@git.kernel.org>
Date: Fri, 17 Oct 2014 13:47:13 -0700
From: tip-bot for Fabian Frederick <tipbot@...or.com>
To: linux-tip-commits@...r.kernel.org
Cc: fabf@...net.be, hpa@...ux.intel.com, hpa@...or.com,
linux-kernel@...r.kernel.org, tglx@...utronix.de, mingo@...nel.org
Subject: [tip:x86/cleanups] x86, msr: Convert printk to pr_foo()
Commit-ID: 951a18c6fee5d2f6f5d7b5118776bf787bf9c351
Gitweb: http://git.kernel.org/tip/951a18c6fee5d2f6f5d7b5118776bf787bf9c351
Author: Fabian Frederick <fabf@...net.be>
AuthorDate: Fri, 17 Oct 2014 22:01:50 +0200
Committer: H. Peter Anvin <hpa@...ux.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@...net.be>
Link: http://lkml.kernel.org/r/1413576110-27103-1-git-send-email-fabf@skynet.be
Signed-off-by: H. Peter Anvin <hpa@...ux.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;
}
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists