MIPS: Alchemy: Fix warnings in DB1x00 / PB1000 / PB1550 board setup code

This patch fixes warnings due to potentially unused
variables in board setup code or mixed variables
declaration and code (forbidden by ISO C90).

Signed-off-by: Florian Fainelli <florian@openwrt.org>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

diff --git a/arch/mips/alchemy/devboards/db1x00/board_setup.c b/arch/mips/alchemy/devboards/db1x00/board_setup.c
index 64eb26ffd08883383ba825e1f5f92f4239f1bbe7..7aee14d78eea126a0925bb12f26b7665611a5e23 100644 (file)
--- a/arch/mips/alchemy/devboards/db1x00/board_setup.c
+++ b/arch/mips/alchemy/devboards/db1x00/board_setup.c
@@ -85,12 +85,14 @@ void board_reset(void)
 void __init board_setup(void)
 {
        unsigned long bcsr1, bcsr2;
-       u32 pin_func = 0;
+       u32 pin_func;
        char *argptr;
 
        bcsr1 = DB1000_BCSR_PHYS_ADDR;
        bcsr2 = DB1000_BCSR_PHYS_ADDR + DB1000_BCSR_HEXLED_OFS;
 
+       pin_func = 0;
+
 #ifdef CONFIG_MIPS_DB1000
        printk(KERN_INFO "AMD Alchemy Au1000/Db1000 Board\n");
 #endif

diff --git a/arch/mips/alchemy/devboards/pb1000/board_setup.c b/arch/mips/alchemy/devboards/pb1000/board_setup.c
index 287d661827eb0b44768f403c74c08976863df509..50fff504ae05cf395a05927e58f996686f9ef45a 100644 (file)
--- a/arch/mips/alchemy/devboards/pb1000/board_setup.c
+++ b/arch/mips/alchemy/devboards/pb1000/board_setup.c
@@ -46,9 +46,13 @@ void __init board_setup(void)
        u32 pin_func, static_cfg0;
        u32 sys_freqctrl, sys_clksrc;
        u32 prid = read_c0_prid();
+       char *argptr;
+
+       sys_freqctrl = 0;
+       sys_clksrc = 0;
+       argptr = prom_getcmdline();
 
 #ifdef CONFIG_SERIAL_8250_CONSOLE
-       char *argptr = prom_getcmdline();
        argptr = strstr(argptr, "console=");
        if (argptr == NULL) {
                argptr = prom_getcmdline();

diff --git a/arch/mips/alchemy/devboards/pb1550/board_setup.c b/arch/mips/alchemy/devboards/pb1550/board_setup.c
index bb41740fecf544fe525f7cd11f718973678babb2..0d060c3dd6f8b6dd047d021d830276fee8836fcb 100644 (file)
--- a/arch/mips/alchemy/devboards/pb1550/board_setup.c
+++ b/arch/mips/alchemy/devboards/pb1550/board_setup.c
@@ -56,14 +56,13 @@ void board_reset(void)
 void __init board_setup(void)
 {
        u32 pin_func;
+       char *argptr;
 
        bcsr_init(PB1550_BCSR_PHYS_ADDR,
                  PB1550_BCSR_PHYS_ADDR + PB1550_BCSR_HEXLED_OFS);
 
-
-#ifdef CONFIG_SERIAL_8250_CONSOLE
-       char *argptr;
        argptr = prom_getcmdline();
+#ifdef CONFIG_SERIAL_8250_CONSOLE
        argptr = strstr(argptr, "console=");
        if (argptr == NULL) {
                argptr = prom_getcmdline();