| From 608ee0ea805144d1580c44dea3d9c47320bf33f7 Mon Sep 17 00:00:00 2001 |
| From: Simon Horman <horms+renesas@verge.net.au> |
| Date: Mon, 16 Jun 2014 20:21:13 +0900 |
| Subject: 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> |
| (cherry picked from commit ecdaca48629bd99609fdc612685363330967dce2) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| arch/arm/mach-shmobile/common.h | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/arch/arm/mach-shmobile/common.h b/arch/arm/mach-shmobile/common.h |
| index ab5a9b2886cf..98056081f0da 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 |
| -- |
| 2.1.2 |
| |
