[PATCH] ARM: psci: fix warning on psci_init if ARM_PSCI is undefined

[PATCH] ARM: psci: fix warning on psci_init if ARM_PSCI is undefined

[Christian Engelmayer]

Commit e71246a (PSCI: Add initial support for PSCIv0.2 functions) changed the
return type of function psci_init() from void to int, but left the static
inline stub used if CONFIG_ARM_PSCI is not defined otherwise untouched. This
results in minor compile warning "warning: no return statement in function
returning non-void [-Wreturn-type]". The return value is currently not
evaluated by the only caller anyway.

Signed-off-by: Christian Engelmayer <cengelma@gmx.at>
---
Compile tested only. Applies against branch next in tree
git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git
---
 arch/arm/include/asm/psci.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/include/asm/psci.h b/arch/arm/include/asm/psci.h
index b93e34a..c25ef3e 100644
--- a/arch/arm/include/asm/psci.h
+++ b/arch/arm/include/asm/psci.h
@@ -41,7 +41,7 @@ extern struct smp_operations psci_smp_ops;
 int psci_init(void);
 bool psci_smp_available(void);
 #else
-static inline int psci_init(void) { }
+static inline int psci_init(void) { return 0; }
 static inline bool psci_smp_available(void) { return false; }
 #endif
 
-- 
1.9.1

[PATCH] ARM: psci: fix warning on psci_init if ARM_PSCI is undefined

[Christoffer Dall]

On Tue, May 27, 2014 at 11:20:47PM +0200, Christian Engelmayer wrote:
> Commit e71246a (PSCI: Add initial support for PSCIv0.2 functions) changed the
> return type of function psci_init() from void to int, but left the static
> inline stub used if CONFIG_ARM_PSCI is not defined otherwise untouched. This
> results in minor compile warning "warning: no return statement in function
> returning non-void [-Wreturn-type]". The return value is currently not
> evaluated by the only caller anyway.
> 
> Signed-off-by: Christian Engelmayer <cengelma@gmx.at>
> ---
> Compile tested only. Applies against branch next in tree
> git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git

I sent out a fix for this yesterday as well, think Paolo was going to
apply that one:
http://lists.infradead.org/pipermail/linux-arm-kernel/2014-May/260009.html

Thanks,
-Christoffer

[PATCH] ARM: psci: fix warning on psci_init if ARM_PSCI is undefined

[Christian Engelmayer]

On Wed, 28 May 2014 09:59:25 +0200, Christoffer Dall <christoffer.dall@linaro.org> wrote:
> On Tue, May 27, 2014 at 11:20:47PM +0200, Christian Engelmayer wrote:
> > Commit e71246a (PSCI: Add initial support for PSCIv0.2 functions) changed the
> > return type of function psci_init() from void to int, but left the static
> > inline stub used if CONFIG_ARM_PSCI is not defined otherwise untouched. This
> > results in minor compile warning "warning: no return statement in function
> > returning non-void [-Wreturn-type]". The return value is currently not
> > evaluated by the only caller anyway.
> > 
> > Signed-off-by: Christian Engelmayer <cengelma@gmx.at>
> > ---
> > Compile tested only. Applies against branch next in tree
> > git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git
> 
> I sent out a fix for this yesterday as well, think Paolo was going to
> apply that one:
> http://lists.infradead.org/pipermail/linux-arm-kernel/2014-May/260009.html

Thanks for letting me know Christoffer! I missed that when checking for already
submitted patches for this. Both patches only differ in the commit log message,
so it's fine either way.

Regards,
Christian