aboutsummaryrefslogtreecommitdiffstats
path: root/arch/avr32
diff options
context:
space:
mode:
authorHans-Christian Egtvedt <hans-christian.egtvedt@atmel.com>2011-06-06 18:19:20 +0200
committerHans-Christian Egtvedt <hans-christian.egtvedt@atmel.com>2011-06-14 13:37:31 +0200
commitc162755491f7ca9853cb9f2aaa3ff3677c1bda78 (patch)
tree92184780b6611f7ccdf2af4303d5bd5454e1db05 /arch/avr32
parent3000f0077a5745918830f40826c23fe5bf934b8b (diff)
downloadkernel_samsung_aries-c162755491f7ca9853cb9f2aaa3ff3677c1bda78.zip
kernel_samsung_aries-c162755491f7ca9853cb9f2aaa3ff3677c1bda78.tar.gz
kernel_samsung_aries-c162755491f7ca9853cb9f2aaa3ff3677c1bda78.tar.bz2
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>
Diffstat (limited to 'arch/avr32')
-rw-r--r--arch/avr32/mach-at32ap/intc.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/avr32/mach-at32ap/intc.c b/arch/avr32/mach-at32ap/intc.c
index 3e36461..c9ac2f8 100644
--- a/arch/avr32/mach-at32ap/intc.c
+++ b/arch/avr32/mach-at32ap/intc.c
@@ -167,14 +167,12 @@ static int intc_suspend(void)
return 0;
}
-static int intc_resume(void)
+static void intc_resume(void)
{
int i;
for (i = 0; i < 64; i++)
intc_writel(&intc0, INTPR0 + 4 * i, intc0.saved_ipr[i]);
-
- return 0;
}
#else
#define intc_suspend NULL