From 6ca300aec0652661f2dd28c9976f9ecb6a338b77 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Thu, 14 May 2020 08:30:05 -0400 Subject: [PATCH] socfpga: Mark socfpga_fpga_add() as static inline in the non-FPGA case 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 Cc: Simon Goldschmidt Cc: Ley Foon Tan Signed-off-by: Tom Rini Acked-by: Marek Vasut --- arch/arm/mach-socfpga/include/mach/misc.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mach-socfpga/include/mach/misc.h b/arch/arm/mach-socfpga/include/mach/misc.h index f6de1cc..a85c5ae 100644 --- a/arch/arm/mach-socfpga/include/mach/misc.h +++ b/arch/arm/mach-socfpga/include/mach/misc.h @@ -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 -- 2.7.4