ARM: kirkwood: kirkwood_pm_init() should return void (77dfdeb4) · Commits · 戴 / test

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>

arch/arm/mach-kirkwood/pm.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -18,6 +18,7 @@
	#include <linux/suspend.h>		#include <linux/suspend.h>
	#include <linux/io.h>		#include <linux/io.h>
	#include <mach/bridge-regs.h>		#include <mach/bridge-regs.h>
			#include "common.h"

	static void __iomem *ddr_operation_base;		static void __iomem *ddr_operation_base;

	@@ -65,9 +66,8 @@ static const struct platform_suspend_ops kirkwood_suspend_ops = {
	.valid = kirkwood_pm_valid_standby,		.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);		ddr_operation_base = ioremap(DDR_OPERATION_BASE, 4);
	suspend_set_ops(&kirkwood_suspend_ops);		suspend_set_ops(&kirkwood_suspend_ops);
	return 0;
	}		}

Admin message