linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 3/4 linux-next] x86, msr: convert printk to pr_foo()
@ 2014-10-17 20:01 Fabian Frederick
  2014-10-17 20:47 ` [tip:x86/cleanups] x86, msr: Convert " tip-bot for Fabian Frederick
  0 siblings, 1 reply; 2+ messages in thread
From: Fabian Frederick @ 2014-10-17 20:01 UTC (permalink / raw)
  To: linux-kernel
  Cc: Fabian Frederick, H. Peter Anvin, Thomas Gleixner, Ingo Molnar,
	x86

Also define pr_fmt.

Signed-off-by: Fabian Frederick <fabf@skynet.be>
---
 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 5b14dac..1c66cd0 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;
 	}
-- 
1.9.3


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [tip:x86/cleanups] x86, msr: Convert printk to pr_foo()
  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
  0 siblings, 0 replies; 2+ messages in thread
From: tip-bot for Fabian Frederick @ 2014-10-17 20:47 UTC (permalink / raw)
  To: linux-tip-commits; +Cc: fabf, hpa, hpa, linux-kernel, tglx, mingo

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;
 	}

^ permalink raw reply related	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2014-10-17 20:47 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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:x86/cleanups] x86, msr: Convert " tip-bot for Fabian Frederick

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).