diff options
| author | Ezequiel Garcia <ezequiel.garcia@free-electrons.com> | 2014-01-17 15:52:11 -0300 |
|---|---|---|
| committer | Jason Cooper <jason@lakedaemon.net> | 2014-01-18 23:48:17 +0000 |
| commit | 77dfdeb41125b6468790fa4c620da262c910cbc9 (patch) | |
| tree | b58e973a73e7dec3e3e2aaffd1d219ad5d2dccd1 | |
| parent | f28d7de6bd4d41774744e011141945affa127da4 (diff) | |
| download | linux-stable-77dfdeb41125b6468790fa4c620da262c910cbc9.tar.gz linux-stable-77dfdeb41125b6468790fa4c620da262c910cbc9.tar.bz2 linux-stable-77dfdeb41125b6468790fa4c620da262c910cbc9.zip | |
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>
| -rw-r--r-- | arch/arm/mach-kirkwood/pm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-kirkwood/pm.c b/arch/arm/mach-kirkwood/pm.c index 8783a7184e73..c6ab8d9303a5 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; } |