]> git.baikalelectronics.ru Git - kernel.git/commit
powerpc/maple: Fix declaration made after definition
authorNathan Chancellor <natechancellor@gmail.com>
Mon, 23 Mar 2020 22:27:29 +0000 (15:27 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 23 Apr 2020 08:36:35 +0000 (10:36 +0200)
commit4d2df87d14dcb72e9697a3ead5e6fd8e7cacc337
tree98808c4483ae5dd1e73dfc9e12fe717f3223e21d
parent68fa7ba6487189a12e566619a93932f9e72a78f7
powerpc/maple: Fix declaration made after definition

[ Upstream commit 9a17365bdef050f7dbafcdbe4f0901f4ff385487 ]

When building ppc64 defconfig, Clang errors (trimmed for brevity):

  arch/powerpc/platforms/maple/setup.c:365:1: error: attribute declaration
  must precede definition [-Werror,-Wignored-attributes]
  machine_device_initcall(maple, maple_cpc925_edac_setup);
  ^

machine_device_initcall expands to __define_machine_initcall, which in
turn has the macro machine_is used in it, which declares mach_##name
with an __attribute__((weak)). define_machine actually defines
mach_##name, which in this file happens before the declaration, hence
the warning.

To fix this, move define_machine after machine_device_initcall so that
the declaration occurs before the definition, which matches how
machine_device_initcall and define_machine work throughout
arch/powerpc.

While we're here, remove some spaces before tabs.

Fixes: 4fe069b06755 ("edac: cpc925 MC platform device setup")
Reported-by: Nick Desaulniers <ndesaulniers@google.com>
Suggested-by: Ilie Halip <ilie.halip@gmail.com>
Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20200323222729.15365-1-natechancellor@gmail.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
arch/powerpc/platforms/maple/setup.c