ARM: shmobile: rcar-gen2: correct return value of shmobile_smp_apmu_suspend_init

PATCH New Simon Horman 3 participants 3 messages Jun 16, 2014

Subsystems (4)

Arm (32-bit) Arm sub-architectures SuperH Arm/RISC-V/Renesas architecture

lore

Share & tools

lore

Simon Horman

author

2014-06-16 11:27 UTC #0 lore raw

PATCH 1/1 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 <[email protected]>

Signed-off-by Simon Horman <[email protected]>

---

This patch resolves the following build warnings:
In file included from arch/arm/mach-shmobile/clock.c:53:0:
arch/arm/mach-shmobile/include/mach/common.h: In function 'shmobile_smp_apmu_suspend_init':
arch/arm/mach-shmobile/include/mach/common.h:41:130: warning: 'return' with a value, in function returning void [enabled by default] In file included from arch/arm/mach-shmobile/console.c:22:0:
arch/arm/mach-shmobile/include/mach/common.h: In function 'shmobile_smp_apmu_suspend_init':
arch/arm/mach-shmobile/include/mach/common.h:41:130: warning: 'return' with a value, in function returning void [enabled by default]
CC arch/arm/mach-shmobile/board-bockw-reference.o
In file included from arch/arm/mach-shmobile/clock-r8a7778.c:43:0:
arch/arm/mach-shmobile/include/mach/common.h: In function 'shmobile_smp_apmu_suspend_init':
arch/arm/mach-shmobile/include/mach/common.h:41:130: warning: 'return' with a value, in function returning void [enabled by default] In file included from arch/arm/mach-shmobile/board-bockw-reference.c:22:0:
arch/arm/mach-shmobile/include/mach/common.h: In function 'shmobile_smp_apmu_suspend_init':
arch/arm/mach-shmobile/include/mach/common.h:41:130: warning: 'return' with a value, in function returning void [enabled by default] In file included from arch/arm/mach-shmobile/setup-r8a7778.c:42:0:
arch/arm/mach-shmobile/include/mach/common.h: In function 'shmobile_smp_apmu_suspend_init':
arch/arm/mach-shmobile/include/mach/common.h:41:130: warning: 'return' with a value, in function returning void [enabled by default]

---
 arch/arm/mach-shmobile/include/mach/common.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

arch/arm/mach-shmobile/include/mach/common.h +1 -1

index 8f0cd57..46766fc 100644
@@ -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) { return; }
 #endif
 
 #ifdef CONFIG_CPU_IDLE

Signature · 1 line

2.0.0.rc2

Sergei Shtylyov

2014-06-16 12:13 UTC #1 lore raw

PATCH 1/1 ARM: shmobile: rcar-gen2: correct return value of shmobile_smp_apmu_suspend_init

Hello.

Quoted 10 lines · Simon Horman

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 <[email protected]>
Signed-off-by Simon Horman <[email protected]>

[...]

arch/arm/mach-shmobile/include/mach/common.h int shmobile_suspend_init(void); · line 41

Quoted 10 lines

arch/arm/mach-shmobile/include/mach/common.h +1 -1

index 8f0cd57..46766fc 100644
@@ -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) { return; }

I wonder why you kept *return* at all?

WBR, Sergei

Simon Horman

2014-06-16 12:25 UTC #2 lore raw

PATCH 1/1 ARM: shmobile: rcar-gen2: correct return value of shmobile_smp_apmu_suspend_init

Quoted 17 lines · Sergei Shtylyov

Hello.
Quoted 10 lines · Simon Horman
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 <[email protected]>
Signed-off-by Simon Horman <[email protected]>
[...]

Quoted 12 lines

arch/arm/mach-shmobile/include/mach/common.h int shmobile_suspend_init(void); · line 41
Quoted 10 lines
arch/arm/mach-shmobile/include/mach/common.h +1 -1
index 8f0cd57..46766fc 100644
@@ -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) { return; }
I wonder why you kept *return* at all?

Thanks, I will remove it.