aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2009-10-18 10:04:09 -0400
committerRalf Baechle <ralf@linux-mips.org>2010-02-27 06:52:56 -0500
commit32fc0adeb89c7e1e592bf31b7158ddc154298207 (patch)
tree737385d4751364194c416ea03021e4b86cd680eb
parent66a1d9baf4962defb3fc41439e3a22e752182f9f (diff)
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>
-rw-r--r--arch/mips/alchemy/devboards/db1x00/board_setup.c4
-rw-r--r--arch/mips/alchemy/devboards/pb1000/board_setup.c6
-rw-r--r--arch/mips/alchemy/devboards/pb1550/board_setup.c5
3 files changed, 10 insertions, 5 deletions
diff --git a/arch/mips/alchemy/devboards/db1x00/board_setup.c b/arch/mips/alchemy/devboards/db1x00/board_setup.c
index 64eb26ffd088..7aee14d78eea 100644
--- 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)
85void __init board_setup(void) 85void __init board_setup(void)
86{ 86{
87 unsigned long bcsr1, bcsr2; 87 unsigned long bcsr1, bcsr2;
88 u32 pin_func = 0; 88 u32 pin_func;
89 char *argptr; 89 char *argptr;
90 90
91 bcsr1 = DB1000_BCSR_PHYS_ADDR; 91 bcsr1 = DB1000_BCSR_PHYS_ADDR;
92 bcsr2 = DB1000_BCSR_PHYS_ADDR + DB1000_BCSR_HEXLED_OFS; 92 bcsr2 = DB1000_BCSR_PHYS_ADDR + DB1000_BCSR_HEXLED_OFS;
93 93
94 pin_func = 0;
95
94#ifdef CONFIG_MIPS_DB1000 96#ifdef CONFIG_MIPS_DB1000
95 printk(KERN_INFO "AMD Alchemy Au1000/Db1000 Board\n"); 97 printk(KERN_INFO "AMD Alchemy Au1000/Db1000 Board\n");
96#endif 98#endif
diff --git a/arch/mips/alchemy/devboards/pb1000/board_setup.c b/arch/mips/alchemy/devboards/pb1000/board_setup.c
index 287d661827eb..50fff504ae05 100644
--- 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)
46 u32 pin_func, static_cfg0; 46 u32 pin_func, static_cfg0;
47 u32 sys_freqctrl, sys_clksrc; 47 u32 sys_freqctrl, sys_clksrc;
48 u32 prid = read_c0_prid(); 48 u32 prid = read_c0_prid();
49 char *argptr;
50
51 sys_freqctrl = 0;
52 sys_clksrc = 0;
53 argptr = prom_getcmdline();
49 54
50#ifdef CONFIG_SERIAL_8250_CONSOLE 55#ifdef CONFIG_SERIAL_8250_CONSOLE
51 char *argptr = prom_getcmdline();
52 argptr = strstr(argptr, "console="); 56 argptr = strstr(argptr, "console=");
53 if (argptr == NULL) { 57 if (argptr == NULL) {
54 argptr = prom_getcmdline(); 58 argptr = prom_getcmdline();
diff --git a/arch/mips/alchemy/devboards/pb1550/board_setup.c b/arch/mips/alchemy/devboards/pb1550/board_setup.c
index bb41740fecf5..0d060c3dd6f8 100644
--- 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)
56void __init board_setup(void) 56void __init board_setup(void)
57{ 57{
58 u32 pin_func; 58 u32 pin_func;
59 char *argptr;
59 60
60 bcsr_init(PB1550_BCSR_PHYS_ADDR, 61 bcsr_init(PB1550_BCSR_PHYS_ADDR,
61 PB1550_BCSR_PHYS_ADDR + PB1550_BCSR_HEXLED_OFS); 62 PB1550_BCSR_PHYS_ADDR + PB1550_BCSR_HEXLED_OFS);
62 63
63
64#ifdef CONFIG_SERIAL_8250_CONSOLE
65 char *argptr;
66 argptr = prom_getcmdline(); 64 argptr = prom_getcmdline();
65#ifdef CONFIG_SERIAL_8250_CONSOLE
67 argptr = strstr(argptr, "console="); 66 argptr = strstr(argptr, "console=");
68 if (argptr == NULL) { 67 if (argptr == NULL) {
69 argptr = prom_getcmdline(); 68 argptr = prom_getcmdline();