From: Simon Horman Date: Mon, 16 Jun 2014 11:21:13 +0000 (+0900) Subject: ARM: shmobile: rcar-gen2: correct return value of shmobile_smp_apmu_suspend_init X-Git-Tag: firefly_0821_release~176^2~3446^2^2~5 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=ecdaca48629bd99609fdc612685363330967dce2;p=firefly-linux-kernel-4.4.55.git 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 Signed-off-by: Simon Horman --- diff --git a/arch/arm/mach-shmobile/common.h b/arch/arm/mach-shmobile/common.h index 8f0cd5791583..1e811999557d 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