summaryrefslogtreecommitdiff
path: root/arch/arm/mach-shmobile/common.h
diff options
context:
space:
mode:
authorSimon Horman <horms+renesas@verge.net.au>2014-06-16 11:21:13 (GMT)
committerSimon Horman <horms+renesas@verge.net.au>2014-06-17 10:33:22 (GMT)
commitecdaca48629bd99609fdc612685363330967dce2 (patch)
treef4b4c465b791953e22d14acf3d01323ef69704b9 /arch/arm/mach-shmobile/common.h
parentea2a0d581a3e742c2fb2bc520c8c8887fe1dafa6 (diff)
downloadlinux-ecdaca48629bd99609fdc612685363330967dce2.tar.xz
ARM: shmobile: rcar-gen2: correct return value of shmobile_smp_apmu_suspend_init
The dummy shmobile_smp_apmu_suspend_init() function provided when CPU_IDLE is not set should not return a value as per the signature of the function. This problem appears to have been introduced by 867ba81f728f1daa ("ARM: shmobile: APMU: Add Core-Standby-state for Suspend to RAM"). Cc: Keita Kobayashi <keita.kobayashi.ym@renesas.com> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Diffstat (limited to 'arch/arm/mach-shmobile/common.h')
-rw-r--r--arch/arm/mach-shmobile/common.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-shmobile/common.h b/arch/arm/mach-shmobile/common.h
index 8f0cd57..1e81199 100644
--- a/arch/arm/mach-shmobile/common.h
+++ b/arch/arm/mach-shmobile/common.h
@@ -38,7 +38,7 @@ int shmobile_suspend_init(void);
void shmobile_smp_apmu_suspend_init(void);
#else
static inline int shmobile_suspend_init(void) { return 0; }
-static inline void shmobile_smp_apmu_suspend_init(void) { return 0; }
+static inline void shmobile_smp_apmu_suspend_init(void) { }
#endif
#ifdef CONFIG_CPU_IDLE