m68k/include: Modernize printing of kernel messages

  - Convert from printk() to pr_*(),
  - Add dummies for validating format strings when debugging is
    disabled.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>

diff --git a/arch/m68k/include/asm/bug.h b/arch/m68k/include/asm/bug.h
index ef9a2e47352f0d8a03c55ccb2c32966b1e0d748f..5bc8d91d68d42bf0e046fd046e3f5c9a623a7df6 100644 (file)
--- a/arch/m68k/include/asm/bug.h
+++ b/arch/m68k/include/asm/bug.h
@@ -6,12 +6,12 @@
 #ifdef CONFIG_DEBUG_BUGVERBOSE
 #ifndef CONFIG_SUN3
 #define BUG() do { \
-       printk("kernel BUG at %s:%d!\n", __FILE__, __LINE__); \
+       pr_crit("kernel BUG at %s:%d!\n", __FILE__, __LINE__); \
        __builtin_trap(); \
 } while (0)
 #else
 #define BUG() do { \
-       printk("kernel BUG at %s:%d!\n", __FILE__, __LINE__); \
+       pr_crit("kernel BUG at %s:%d!\n", __FILE__, __LINE__); \
        panic("BUG!"); \
 } while (0)
 #endif

diff --git a/arch/m68k/include/asm/floppy.h b/arch/m68k/include/asm/floppy.h
index 47365b1ccbecfeb9c87f807ad5ab345649572114..c3b9ad6732fc68cc78a65db116372d7055318a6b 100644 (file)
--- a/arch/m68k/include/asm/floppy.h
+++ b/arch/m68k/include/asm/floppy.h
@@ -234,9 +234,9 @@ asmlinkage 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",
-                      virtual_dma_count, virtual_dma_residue, calls, bytes,
-                      dma_wait);
+               pr_info("count=%x, residue=%x calls=%d bytes=%d dma_wait=%d\n",
+                       virtual_dma_count, virtual_dma_residue, calls, bytes,
+                       dma_wait);
                calls = 0;
                dma_wait=0;
 #endif

diff --git a/arch/m68k/include/asm/math-emu.h b/arch/m68k/include/asm/math-emu.h
index 5e9249b0014ca0fcd2faa088bfb8f9d5810c003d..b062696d5a0d99aa3b9f42fe23977c704060d4e0 100644 (file)
--- a/arch/m68k/include/asm/math-emu.h
+++ b/arch/m68k/include/asm/math-emu.h
@@ -105,21 +105,21 @@ struct fp_data {
 #ifdef FPU_EMU_DEBUG
 extern unsigned int fp_debugprint;
 
-#define dprint(bit, fmt, args...) ({                   \
+#define dprint(bit, fmt, ...) ({                       \
        if (fp_debugprint & (1 << (bit)))               \
-               printk(fmt, ## args);                   \
+               pr_info(fmt, ##__VA_ARGS__);            \
 })
 #else
-#define dprint(bit, fmt, args...)
+#define dprint(bit, fmt, ...)  no_printk(fmt, ##__VA_ARGS__)
 #endif
 
 #define uprint(str) ({                                 \
        static int __count = 3;                         \
                                                        \
        if (__count > 0) {                              \
-               printk("You just hit an unimplemented " \
+               pr_err("You just hit an unimplemented " \
                       "fpu instruction (%s)\n", str);  \
-               printk("Please report this to ....\n"); \
+               pr_err("Please report this to ....\n"); \
                __count--;                              \
        }                                               \
 })