Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ARM: Kirkwood: fix kirkwood_pm_init() declaration/type

The kirkwood-pm.c was missing the include of kirkwood-pm.h to
define the kirkwood_pm_init() function. However once this is
included, the types do not match.

Fixup the include, and then the prototype to avoid the following
warning:

arch/arm/mach-mvebu/kirkwood-pm.c:69:12: warning: symbol 'kirkwood_pm_init' was not declared. Should it be static?

Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>

authored by

Ben Dooks and committed by
Gregory CLEMENT
d705c1a6 15b10c6a

+2 -2
+2 -2
arch/arm/mach-mvebu/kirkwood-pm.c
··· 18 18 #include <linux/suspend.h> 19 19 #include <linux/io.h> 20 20 #include "kirkwood.h" 21 + #include "kirkwood-pm.h" 21 22 22 23 static void __iomem *ddr_operation_base; 23 24 static void __iomem *memory_pm_ctrl; ··· 67 66 .valid = kirkwood_pm_valid_standby, 68 67 }; 69 68 70 - int __init kirkwood_pm_init(void) 69 + void __init kirkwood_pm_init(void) 71 70 { 72 71 ddr_operation_base = ioremap(DDR_OPERATION_BASE, 4); 73 72 memory_pm_ctrl = ioremap(MEMORY_PM_CTRL_PHYS, 4); 74 73 75 74 suspend_set_ops(&kirkwood_suspend_ops); 76 - return 0; 77 75 }