linux-mips
[Top] [All Lists]

[PATCH][MIPS] merge a few printk in check_wait()

To: Ralf Baechle <ralf@linux-mips.org>
Subject: [PATCH][MIPS] merge a few printk in check_wait()
From: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
Date: Thu, 19 Oct 2006 00:27:18 +0900
Cc: yoichi_yuasa@tripeaks.co.jp, linux-mips <linux-mips@linux-mips.org>
Organization: TriPeaks Corporation
Original-recipient: rfc822;linux-mips@linux-mips.org
Sender: linux-mips-bounce@linux-mips.org
Hi Ralf,

This patch has merged a few printk in check_wait().

Yoichi

Signed-off-by: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>

diff -pruN -X mips/Documentation/dontdiff 
mips-orig/arch/mips/kernel/cpu-probe.c mips/arch/mips/kernel/cpu-probe.c
--- mips-orig/arch/mips/kernel/cpu-probe.c      2006-10-18 10:20:24.397574000 
+0900
+++ mips/arch/mips/kernel/cpu-probe.c   2006-10-18 10:28:53.113366750 +0900
@@ -120,11 +120,9 @@ static inline void check_wait(void)
        case CPU_R3081:
        case CPU_R3081E:
                cpu_wait = r3081_wait;
-               printk(" available.\n");
                break;
        case CPU_TX3927:
                cpu_wait = r39xx_wait;
-               printk(" available.\n");
                break;
        case CPU_R4200:
 /*     case CPU_R4300: */
@@ -146,35 +144,30 @@ static inline void check_wait(void)
        case CPU_74K:
        case CPU_PR4450:
                cpu_wait = r4k_wait;
-               printk(" available.\n");
                break;
        case CPU_TX49XX:
                cpu_wait = r4k_wait_irqoff;
-               printk(" available.\n");
                break;
        case CPU_AU1000:
        case CPU_AU1100:
        case CPU_AU1500:
        case CPU_AU1550:
        case CPU_AU1200:
-               if (allow_au1k_wait) {
+               if (allow_au1k_wait)
                        cpu_wait = au1k_wait;
-                       printk(" available.\n");
-               } else
-                       printk(" unavailable.\n");
                break;
        case CPU_RM9000:
-               if ((c->processor_id & 0x00ff) >= 0x40) {
+               if ((c->processor_id & 0x00ff) >= 0x40)
                        cpu_wait = r4k_wait;
-                       printk(" available.\n");
-               } else {
-                       printk(" unavailable.\n");
-               }
                break;
        default:
-               printk(" unavailable.\n");
                break;
        }
+
+       if (cpu_wait)
+               printk(" available.\n");
+       else
+               printk(" unavailable.\n");
 }
 
 void __init check_bugs32(void)

<Prev in Thread] Current Thread [Next in Thread>