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>

5 files changed, 16 insertions, 12 deletions

diff --git a/arch/x86/include/asm/floppy.h b/arch/x86/include/asm/floppy.h
index dbe82a5c5eac..d3d74698dce9 100644
--- a/arch/x86/include/asm/floppy.h
+++ b/arch/x86/include/asm/floppy.h
@@ -99,7 +99,7 @@ static irqreturn_t floppy_hardint(int irq, void *dev_id)
                 virtual_dma_residue += virtual_dma_count;
                 virtual_dma_count = 0;
 #ifdef TRACE_FLPY_INT
-                printk("count=%x, residue=%x calls=%d bytes=%d dma_wait=%d\n",
+                printk(KERN_DEBUG "count=%x, residue=%x calls=%d bytes=%d dma_wait=%d\n",
                        virtual_dma_count, virtual_dma_residue, calls, bytes,
                        dma_wait);
                 calls = 0;
diff --git a/arch/x86/include/asm/pci_x86.h b/arch/x86/include/asm/pci_x86.h
index b3a531746026..5ad24a89b19b 100644
--- a/arch/x86/include/asm/pci_x86.h
+++ b/arch/x86/include/asm/pci_x86.h
@@ -7,9 +7,13 @@
 #undef DEBUG
 
 #ifdef DEBUG
-#define DBG(x...) printk(x)
+#define DBG(fmt, ...) printk(fmt, ##__VA_ARGS__)
 #else
-#define DBG(x...)
+#define DBG(fmt, ...)                           \
+do {                                            \
+        if (0)                                  \
+                printk(fmt, ##__VA_ARGS__);     \
+} while (0)
 #endif
 
 #define PCI_PROBE_BIOS          0x0001
diff --git a/arch/x86/include/asm/pgtable-2level.h b/arch/x86/include/asm/pgtable-2level.h
index 98391db840c6..f2b489cf1602 100644
--- a/arch/x86/include/asm/pgtable-2level.h
+++ b/arch/x86/include/asm/pgtable-2level.h
@@ -2,9 +2,9 @@
 #define _ASM_X86_PGTABLE_2LEVEL_H
 
 #define pte_ERROR(e) \
-        printk("%s:%d: bad pte %08lx.\n", __FILE__, __LINE__, (e).pte_low)
+        pr_err("%s:%d: bad pte %08lx\n", __FILE__, __LINE__, (e).pte_low)
 #define pgd_ERROR(e) \
-        printk("%s:%d: bad pgd %08lx.\n", __FILE__, __LINE__, pgd_val(e))
+        pr_err("%s:%d: bad pgd %08lx\n", __FILE__, __LINE__, pgd_val(e))
 
 /*
  * Certain architectures need to do special things when PTEs
diff --git a/arch/x86/include/asm/pgtable-3level.h b/arch/x86/include/asm/pgtable-3level.h
index 43876f16caf1..f824cfbaa9d4 100644
--- a/arch/x86/include/asm/pgtable-3level.h
+++ b/arch/x86/include/asm/pgtable-3level.h
@@ -9,13 +9,13 @@
  */
 
 #define pte_ERROR(e)                                                    \
-        printk("%s:%d: bad pte %p(%08lx%08lx).\n",                      \
+        pr_err("%s:%d: bad pte %p(%08lx%08lx)\n",                       \
                __FILE__, __LINE__, &(e), (e).pte_high, (e).pte_low)
 #define pmd_ERROR(e)                                                    \
-        printk("%s:%d: bad pmd %p(%016Lx).\n",                          \
+        pr_err("%s:%d: bad pmd %p(%016Lx)\n",                           \
                __FILE__, __LINE__, &(e), pmd_val(e))
 #define pgd_ERROR(e)                                                    \
-        printk("%s:%d: bad pgd %p(%016Lx).\n",                          \
+        pr_err("%s:%d: bad pgd %p(%016Lx)\n",                           \
                __FILE__, __LINE__, &(e), pgd_val(e))
 
 /* Rules for using set_pte: the pte being assigned *must* be
diff --git a/arch/x86/include/asm/pgtable_64.h b/arch/x86/include/asm/pgtable_64.h
index 975f709e09ae..8251be02301e 100644
--- a/arch/x86/include/asm/pgtable_64.h
+++ b/arch/x86/include/asm/pgtable_64.h
@@ -26,16 +26,16 @@ extern pgd_t init_level4_pgt[];
 extern void paging_init(void);
 
 #define pte_ERROR(e)                                    \
-        printk("%s:%d: bad pte %p(%016lx).\n",          \
+        pr_err("%s:%d: bad pte %p(%016lx)\n",           \
                __FILE__, __LINE__, &(e), pte_val(e))
 #define pmd_ERROR(e)                                    \
-        printk("%s:%d: bad pmd %p(%016lx).\n",          \
+        pr_err("%s:%d: bad pmd %p(%016lx)\n",           \
                __FILE__, __LINE__, &(e), pmd_val(e))
 #define pud_ERROR(e)                                    \
-        printk("%s:%d: bad pud %p(%016lx).\n",          \
+        pr_err("%s:%d: bad pud %p(%016lx)\n",           \
                __FILE__, __LINE__, &(e), pud_val(e))
 #define pgd_ERROR(e)                                    \
-        printk("%s:%d: bad pgd %p(%016lx).\n",          \
+        pr_err("%s:%d: bad pgd %p(%016lx)\n",           \
                __FILE__, __LINE__, &(e), pgd_val(e))
 
 struct mm_struct;