From 2ad8494c0fd7279aa9a7f73aff3fc38895e77711 Mon Sep 17 00:00:00 2001 From: Anatolij Gustschin Date: Wed, 30 Oct 2019 15:04:10 +0100 Subject: [PATCH] splash: fix build breakage with newer llvm-7 Some configurations (i.e. sandbox) result in unused splash_display_banner() and we get build errors like: common/splash.c:148:20: error: unused function 'splash_display_banner' [-Werror,-Wunused-function] static inline void splash_display_banner(void) { } Drop empty inline function and add guards around the call. Fixes: d2a8271c8851 ("splash: fix splash banner output") Signed-off-by: Anatolij Gustschin Reported-by: Tom Rini Reviewed-by: Tom Rini --- common/splash.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/splash.c b/common/splash.c index 0bcedbb..e7d8477 100644 --- a/common/splash.c +++ b/common/splash.c @@ -144,8 +144,6 @@ void splash_display_banner(void) vidconsole_put_string(dev, buf); vidconsole_position_cursor(dev, 0, row); } -#else -static inline void splash_display_banner(void) { } #endif /* CONFIG_DM_VIDEO && !CONFIG_HIDE_LOGO_VERSION */ /* @@ -177,7 +175,9 @@ int splash_display(void) if (x || y) goto end; +#if defined(CONFIG_DM_VIDEO) && !defined(CONFIG_HIDE_LOGO_VERSION) splash_display_banner(); +#endif end: return ret; } -- 2.7.4