Skip to content

Commit

Permalink
ARM: kirkwood: kirkwood_pm_init() should return void
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Ezequiel Garcia authored and Jason Cooper committed Jan 18, 2014
1 parent f28d7de commit 77dfdeb
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions arch/arm/mach-kirkwood/pm.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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;
}

0 comments on commit 77dfdeb

Please sign in to comment.