]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
socfpga: Mark socfpga_fpga_add() as static inline in the non-FPGA case
authorTom Rini <trini@konsulko.com>
Thu, 14 May 2020 12:30:05 +0000 (08:30 -0400)
committerTom Rini <trini@konsulko.com>
Wed, 1 Jul 2020 14:11:03 +0000 (10:11 -0400)
Unless we mark the function as 'static inline' it may end up being
non-inlined by the compiled and result in duplicate functions.

Cc: Marek Vasut <marex@denx.de>
Cc: Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com>
Cc: Ley Foon Tan <ley.foon.tan@intel.com>
Signed-off-by: Tom Rini <trini@konsulko.com>
Acked-by: Marek Vasut <marex@denx.de>
arch/arm/mach-socfpga/include/mach/misc.h

index f6de1ccb4a010029baef9e217acbfb3ab7c46df6..a85c5aeef955235ebe583a372cdfa1b7610fa1f3 100644 (file)
@@ -20,7 +20,7 @@ extern struct bsel bsel_str[];
 #ifdef CONFIG_FPGA
 void socfpga_fpga_add(void *fpga_desc);
 #else
-inline void socfpga_fpga_add(void *fpga_desc) {}
+static inline void socfpga_fpga_add(void *fpga_desc) {}
 #endif
 
 #ifdef CONFIG_TARGET_SOCFPGA_GEN5