x86/debug: Add KERN_<LEVEL> to bare printks, convert printks to pr_<level>

Use a more current logging style:

 - Bare printks should have a KERN_<LEVEL> for consistency's sake
 - Add pr_fmt where appropriate
 - Neaten some macro definitions
 - Convert some Ok output to OK
 - Use "%s: ", __func__ in pr_fmt for summit
 - Convert some printks to pr_<level>

Message output is not identical in all cases.

Signed-off-by: Joe Perches <joe@perches.com>
Cc: levinsasha928@gmail.com
Link: http://lkml.kernel.org/r/1337655007.24226.10.camel@joe2Laptop
[ merged two similar patches, tidied up the changelog ]
Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 9 insertions, 5 deletions

diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c
index 79c45af81604..ab3f06260712 100644
--- a/arch/x86/kernel/reboot.c
+++ b/arch/x86/kernel/reboot.c
@@ -1,3 +1,5 @@
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/module.h>
 #include <linux/reboot.h>
 #include <linux/init.h>
@@ -152,7 +154,8 @@ static int __init set_bios_reboot(const struct dmi_system_id *d)
 {
         if (reboot_type != BOOT_BIOS) {
                 reboot_type = BOOT_BIOS;
-                printk(KERN_INFO "%s series board detected. Selecting BIOS-method for reboots.\n", d->ident);
+                pr_info("%s series board detected. Selecting %s-method for reboots.\n",
+                        "BIOS", d->ident);
         }
         return 0;
 }
@@ -207,8 +210,8 @@ static int __init set_pci_reboot(const struct dmi_system_id *d)
 {
         if (reboot_type != BOOT_CF9) {
                 reboot_type = BOOT_CF9;
-                printk(KERN_INFO "%s series board detected. "
-                       "Selecting PCI-method for reboots.\n", d->ident);
+                pr_info("%s series board detected. Selecting %s-method for reboots.\n",
+                        "PCI", d->ident);
         }
         return 0;
 }
@@ -217,7 +220,8 @@ static int __init set_kbd_reboot(const struct dmi_system_id *d)
 {
         if (reboot_type != BOOT_KBD) {
                 reboot_type = BOOT_KBD;
-                printk(KERN_INFO "%s series board detected. Selecting KBD-method for reboot.\n", d->ident);
+                pr_info("%s series board detected. Selecting %s-method for reboot.\n",
+                        "KBD", d->ident);
         }
         return 0;
 }
@@ -668,7 +672,7 @@ static void __machine_emergency_restart(int emergency)
 
 static void native_machine_restart(char *__unused)
 {
-        printk("machine restart\n");
+        pr_notice("machine restart\n");
 
         if (!reboot_force)
                 machine_shutdown();