summaryrefslogtreecommitdiff
path: root/arch/mips/pnx833x/common/platform.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2016-10-16 12:31:39 +0300
committerIngo Molnar <mingo@kernel.org>2016-10-16 12:31:39 +0300
commit1d33369db25eb7f37b7a8bd22d736888b4501a9c (patch)
tree116d764339be1bca928870151decbedc53a9e1d1 /arch/mips/pnx833x/common/platform.c
parent23446cb66c073b827779e5eb3dec301623299b32 (diff)
parent1001354ca34179f3db924eb66672442a173147dc (diff)
downloadlinux-1d33369db25eb7f37b7a8bd22d736888b4501a9c.tar.xz
Merge tag 'v4.9-rc1' into x86/urgent, to pick up updates
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/mips/pnx833x/common/platform.c')
-rw-r--r--arch/mips/pnx833x/common/platform.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/arch/mips/pnx833x/common/platform.c b/arch/mips/pnx833x/common/platform.c
index 3cd357737a26..7cf4eb50fc72 100644
--- a/arch/mips/pnx833x/common/platform.c
+++ b/arch/mips/pnx833x/common/platform.c
@@ -232,12 +232,8 @@ static struct platform_device *pnx833x_platform_devices[] __initdata = {
static int __init pnx833x_platform_init(void)
{
- int res;
-
- res = platform_add_devices(pnx833x_platform_devices,
- ARRAY_SIZE(pnx833x_platform_devices));
-
- return res;
+ return platform_add_devices(pnx833x_platform_devices,
+ ARRAY_SIZE(pnx833x_platform_devices));
}
arch_initcall(pnx833x_platform_init);