summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2016-02-23 15:06:38 +0100
committerGregory CLEMENT <gregory.clement@free-electrons.com>2016-02-25 15:38:38 +0100
commitd3201ede944a15eca0f13d2d49b322974f623a4a (patch)
treec0814c113407f7a649e3ab650baa8d1910fe8b1b
parent993e221518a0425272dda85b73b27c827d4e5fad (diff)
downloadlinux-d3201ede944a15eca0f13d2d49b322974f623a4a.tar.bz2
ARM: mv78xx0: avoid unused function warning
mv78xx0 produces a harmless warning when CONFIG_CACHE_FEROCEON_L2 is disabled: arch/arm/mach-mv78xx0/common.c:385:19: warning: 'is_l2_writethrough' defined but not used [-Wunused-function] This avoids the warning by changing the #ifdef to an if(IS_ENABLED()) check with the same resulting object code. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Reviewed-by: Andrew Lunn <andrew@lunn.ch> Acked-by: Jason Cooper <jason@lakedaemon.net> Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
-rw-r--r--arch/arm/mach-mv78xx0/common.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/mach-mv78xx0/common.c b/arch/arm/mach-mv78xx0/common.c
index a1a04df9c05c..99cc93900a24 100644
--- a/arch/arm/mach-mv78xx0/common.c
+++ b/arch/arm/mach-mv78xx0/common.c
@@ -405,9 +405,8 @@ void __init mv78xx0_init(void)
printk("HCLK = %dMHz, ", (hclk + 499999) / 1000000);
printk("TCLK = %dMHz\n", (get_tclk() + 499999) / 1000000);
-#ifdef CONFIG_CACHE_FEROCEON_L2
- feroceon_l2_init(is_l2_writethrough());
-#endif
+ if (IS_ENABLED(CONFIG_CACHE_FEROCEON_L2))
+ feroceon_l2_init(is_l2_writethrough());
/* Setup root of clk tree */
clk_init();