linux-mips
[Top] [All Lists]

[PATCH][1/5][MIPS] txx9_board_vec set directly without mips_machtype

To: Ralf Baechle <ralf@linux-mips.org>
Subject: [PATCH][1/5][MIPS] txx9_board_vec set directly without mips_machtype
From: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
Date: Sun, 13 Jul 2008 19:51:55 +0900
Cc: yoichi_yuasa@tripeaks.co.jp, Atsushi Nemoto <anemo@mba.ocn.ne.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
txx9_board_vec set directly without mips_machtype.

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

diff -pruN -X /home/yuasa/Memo/dontdiff 
linux-orig/arch/mips/txx9/generic/setup.c linux/arch/mips/txx9/generic/setup.c
--- linux-orig/arch/mips/txx9/generic/setup.c   2008-07-13 15:59:38.884682499 
+0900
+++ linux/arch/mips/txx9/generic/setup.c        2008-07-13 16:00:06.436034688 
+0900
@@ -99,19 +99,6 @@ extern struct txx9_board_vec rbtx4927_ve
 extern struct txx9_board_vec rbtx4937_vec;
 extern struct txx9_board_vec rbtx4938_vec;
 
-/* board definitions */
-static struct txx9_board_vec *board_vecs[] __initdata = {
-#ifdef CONFIG_TOSHIBA_JMR3927
-       &jmr3927_vec,
-#endif
-#ifdef CONFIG_TOSHIBA_RBTX4927
-       &rbtx4927_vec,
-       &rbtx4937_vec,
-#endif
-#ifdef CONFIG_TOSHIBA_RBTX4938
-       &rbtx4938_vec,
-#endif
-};
 struct txx9_board_vec *txx9_board_vec __initdata;
 static char txx9_system_type[32];
 
@@ -134,31 +121,26 @@ void __init prom_init_cmdline(void)
 
 void __init prom_init(void)
 {
-       int i;
-
 #ifdef CONFIG_CPU_TX39XX
-       mips_machtype = MACH_TOSHIBA_JMR3927;
+       txx9_board_vec = &jmr3927_vec;
 #endif
 #ifdef CONFIG_CPU_TX49XX
        switch (TX4938_REV_PCODE()) {
        case 0x4927:
-               mips_machtype = MACH_TOSHIBA_RBTX4927;
+               txx9_board_vec = &rbtx4927_vec;
                break;
        case 0x4937:
-               mips_machtype = MACH_TOSHIBA_RBTX4937;
+               txx9_board_vec = &rbtx4937_vec;
                break;
        case 0x4938:
-               mips_machtype = MACH_TOSHIBA_RBTX4938;
+               txx9_board_vec = &rbtx4938_vec;
                break;
        }
 #endif
-       for (i = 0; i < ARRAY_SIZE(board_vecs); i++) {
-               if (board_vecs[i]->type == mips_machtype) {
-                       txx9_board_vec = board_vecs[i];
-                       strcpy(txx9_system_type, txx9_board_vec->system);
-                       return txx9_board_vec->prom_init();
-               }
-       }
+
+       strcpy(txx9_system_type, txx9_board_vec->system);
+
+       return txx9_board_vec->prom_init();
 }
 
 void __init prom_free_prom_memory(void)

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