diff options
| author | Hans-Christian Egtvedt <hans-christian.egtvedt@atmel.com> | 2011-06-06 12:19:20 -0400 |
|---|---|---|
| committer | Hans-Christian Egtvedt <hans-christian.egtvedt@atmel.com> | 2011-06-14 07:37:31 -0400 |
| commit | c162755491f7ca9853cb9f2aaa3ff3677c1bda78 (patch) | |
| tree | 92184780b6611f7ccdf2af4303d5bd5454e1db05 | |
| parent | 3000f0077a5745918830f40826c23fe5bf934b8b (diff) | |
avr32: make intc_resume() return void to conform to syscore_ops
This patch removes the unneeded, and now wrong, return 0 from intc_resume() and
lets the function return void instead. This matches the resume callback in
struct syscore_ops.
Signed-off-by: Hans-Christian Egtvedt <hans-christian.egtvedt@atmel.com>
| -rw-r--r-- | arch/avr32/mach-at32ap/intc.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/avr32/mach-at32ap/intc.c b/arch/avr32/mach-at32ap/intc.c index 3e3646186c9f..c9ac2f8e8f64 100644 --- a/arch/avr32/mach-at32ap/intc.c +++ b/arch/avr32/mach-at32ap/intc.c | |||
| @@ -167,14 +167,12 @@ static int intc_suspend(void) | |||
| 167 | return 0; | 167 | return 0; |
| 168 | } | 168 | } |
| 169 | 169 | ||
| 170 | static int intc_resume(void) | 170 | static void intc_resume(void) |
| 171 | { | 171 | { |
| 172 | int i; | 172 | int i; |
| 173 | 173 | ||
| 174 | for (i = 0; i < 64; i++) | 174 | for (i = 0; i < 64; i++) |
| 175 | intc_writel(&intc0, INTPR0 + 4 * i, intc0.saved_ipr[i]); | 175 | intc_writel(&intc0, INTPR0 + 4 * i, intc0.saved_ipr[i]); |
| 176 | |||
| 177 | return 0; | ||
| 178 | } | 176 | } |
| 179 | #else | 177 | #else |
| 180 | #define intc_suspend NULL | 178 | #define intc_suspend NULL |
