splash: fix build breakage with newer llvm-7
authorAnatolij Gustschin <agust@denx.de>
Wed, 30 Oct 2019 14:04:10 +0000 (15:04 +0100)
committerAnatolij Gustschin <agust@denx.de>
Thu, 31 Oct 2019 08:10:34 +0000 (09:10 +0100)
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 <agust@denx.de>
Reported-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
common/splash.c

index 0bcedbb0bad9804e957916c6825c56f344504741..e7d847726d0bb1d5df9470be3f48ba22c86ee6d4 100644 (file)
@@ -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;
 }