diff options
| author | WANG Cong <xiyou.wangcong@gmail.com> | 2011-07-25 20:12:43 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-25 23:57:12 -0400 |
| commit | ce1bb7afc5648056cf66896c4aebc0062bb12f79 (patch) | |
| tree | 7bd48b2fa16db61f1228c16f2281720d1777a9c5 /arch | |
| parent | b7de110044b4e26adcb7b278d14da93133692ed7 (diff) | |
cris: fix some build warnings in pinmux.c
Fix some harmless warnings such as
arch/cris/arch-v32/mach-a3/pinmux.c:273: warning: ISO C90 forbids mixed declarations and code:
Signed-off-by: WANG Cong <xiyou.wangcong@gmail.com>
Cc: Mikael Starvik <starvik@axis.com>
Cc: Jesper Nilsson <jesper.nilsson@axis.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/cris/arch-v32/mach-a3/pinmux.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/arch/cris/arch-v32/mach-a3/pinmux.c b/arch/cris/arch-v32/mach-a3/pinmux.c index 18648ef2d874..591f77526746 100644 --- a/arch/cris/arch-v32/mach-a3/pinmux.c +++ b/arch/cris/arch-v32/mach-a3/pinmux.c | |||
| @@ -85,6 +85,8 @@ crisv32_pinmux_alloc_fixed(enum fixed_function function) | |||
| 85 | int ret = -EINVAL; | 85 | int ret = -EINVAL; |
| 86 | char saved[sizeof pins]; | 86 | char saved[sizeof pins]; |
| 87 | unsigned long flags; | 87 | unsigned long flags; |
| 88 | reg_pinmux_rw_hwprot hwprot; | ||
| 89 | reg_clkgen_rw_clk_ctrl clk_ctrl; | ||
| 88 | 90 | ||
| 89 | spin_lock_irqsave(&pinmux_lock, flags); | 91 | spin_lock_irqsave(&pinmux_lock, flags); |
| 90 | 92 | ||
| @@ -93,9 +95,8 @@ crisv32_pinmux_alloc_fixed(enum fixed_function function) | |||
| 93 | 95 | ||
| 94 | crisv32_pinmux_init(); /* must be done before we read rw_hwprot */ | 96 | crisv32_pinmux_init(); /* must be done before we read rw_hwprot */ |
| 95 | 97 | ||
| 96 | reg_pinmux_rw_hwprot hwprot = REG_RD(pinmux, regi_pinmux, rw_hwprot); | 98 | hwprot = REG_RD(pinmux, regi_pinmux, rw_hwprot); |
| 97 | reg_clkgen_rw_clk_ctrl clk_ctrl = REG_RD(clkgen, regi_clkgen, | 99 | clk_ctrl = REG_RD(clkgen, regi_clkgen, rw_clk_ctrl); |
| 98 | rw_clk_ctrl); | ||
| 99 | 100 | ||
| 100 | switch (function) { | 101 | switch (function) { |
| 101 | case pinmux_eth: | 102 | case pinmux_eth: |
| @@ -262,6 +263,7 @@ crisv32_pinmux_dealloc_fixed(enum fixed_function function) | |||
| 262 | int ret = -EINVAL; | 263 | int ret = -EINVAL; |
| 263 | char saved[sizeof pins]; | 264 | char saved[sizeof pins]; |
| 264 | unsigned long flags; | 265 | unsigned long flags; |
| 266 | reg_pinmux_rw_hwprot hwprot; | ||
| 265 | 267 | ||
| 266 | spin_lock_irqsave(&pinmux_lock, flags); | 268 | spin_lock_irqsave(&pinmux_lock, flags); |
| 267 | 269 | ||
| @@ -270,7 +272,7 @@ crisv32_pinmux_dealloc_fixed(enum fixed_function function) | |||
| 270 | 272 | ||
| 271 | crisv32_pinmux_init(); /* must be done before we read rw_hwprot */ | 273 | crisv32_pinmux_init(); /* must be done before we read rw_hwprot */ |
| 272 | 274 | ||
| 273 | reg_pinmux_rw_hwprot hwprot = REG_RD(pinmux, regi_pinmux, rw_hwprot); | 275 | hwprot = REG_RD(pinmux, regi_pinmux, rw_hwprot); |
| 274 | 276 | ||
| 275 | switch (function) { | 277 | switch (function) { |
| 276 | case pinmux_eth: | 278 | case pinmux_eth: |