From: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
Date: Fri, 17 Jan 2014 18:52:11 +0000 (-0300)
Subject: ARM: kirkwood: kirkwood_pm_init() should return void
X-Git-Tag: upstream/snapshot3+hdmi~3485^2~9^2~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=77dfdeb41125b6468790fa4c620da262c910cbc9;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

ARM: kirkwood: kirkwood_pm_init() should return void

This function was originally meant to return void as declared in the
common.h header. Fix it and include the header to catch these errors
in the future.

[jac] removed 'return 0;' to clear this warning:

  arch/arm/mach-kirkwood/pm.c: In function 'kirkwood_pm_init':
  arch/arm/mach-kirkwood/pm.c:73:2: warning: 'return' with a value, in function returning void [enabled by default]

Reported-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
Acked-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
---

diff --git a/arch/arm/mach-kirkwood/pm.c b/arch/arm/mach-kirkwood/pm.c
index 8783a71..c6ab8d9 100644
--- a/arch/arm/mach-kirkwood/pm.c
+++ b/arch/arm/mach-kirkwood/pm.c
@@ -18,6 +18,7 @@
 #include <linux/suspend.h>
 #include <linux/io.h>
 #include <mach/bridge-regs.h>
+#include "common.h"
 
 static void __iomem *ddr_operation_base;
 
@@ -65,9 +66,8 @@ static const struct platform_suspend_ops kirkwood_suspend_ops = {
 	.valid = kirkwood_pm_valid_standby,
 };
 
-int __init kirkwood_pm_init(void)
+void __init kirkwood_pm_init(void)
 {
 	ddr_operation_base = ioremap(DDR_OPERATION_BASE, 4);
 	suspend_set_ops(&kirkwood_suspend_ops);
-	return 0;
 }