| Message ID | 20170802093826.3703737-1-arnd@arndb.de |
|---|---|
| State | Accepted |
| Commit | dfc8e9165cfe0b50438f51df5a82ab1dcc08baf4 |
| Headers | show |
On Wed, Aug 2, 2017 at 11:38 AM, Arnd Bergmann <arnd@arndb.de> wrote: > The newly introduced fb_console_init/exit declarations have a > dummy alternative that is marked 'static' in the header but not > inline, leading to a warning whenever the header gets included: > > In file included from drivers/video/fbdev/core/fbmem.c:35:0: > include/linux/fbcon.h:9:13: error: 'fb_console_exit' defined but not used [-Werror=unused-function] > > This adds the intended 'inline'. > > Fixes: 6104c37094e7 ("fbcon: Make fbcon a built-time depency for fbdev") > Signed-off-by: Arnd Bergmann <arnd@arndb.de> Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> > --- > include/linux/fbcon.h | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/include/linux/fbcon.h b/include/linux/fbcon.h > index 0fac6305d51c..f68a7db14165 100644 > --- a/include/linux/fbcon.h > +++ b/include/linux/fbcon.h > @@ -5,8 +5,8 @@ > void __init fb_console_init(void); > void __exit fb_console_exit(void); > #else > -static void fb_console_init(void) {} > -static void fb_console_exit(void) {} > +static inline void fb_console_init(void) {} > +static inline void fb_console_exit(void) {} > #endif > > #endif /* _LINUX_FBCON_H */ > -- > 2.9.0 > -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch
On Wednesday, August 02, 2017 11:38:07 AM Arnd Bergmann wrote: > The newly introduced fb_console_init/exit declarations have a > dummy alternative that is marked 'static' in the header but not > inline, leading to a warning whenever the header gets included: > > In file included from drivers/video/fbdev/core/fbmem.c:35:0: > include/linux/fbcon.h:9:13: error: 'fb_console_exit' defined but not used [-Werror=unused-function] > > This adds the intended 'inline'. > > Fixes: 6104c37094e7 ("fbcon: Make fbcon a built-time depency for fbdev") > Signed-off-by: Arnd Bergmann <arnd@arndb.de> Patch queued for 4.14, thanks. Best regards, -- Bartlomiej Zolnierkiewicz Samsung R&D Institute Poland Samsung Electronics
diff --git a/include/linux/fbcon.h b/include/linux/fbcon.h index 0fac6305d51c..f68a7db14165 100644 --- a/include/linux/fbcon.h +++ b/include/linux/fbcon.h @@ -5,8 +5,8 @@ void __init fb_console_init(void); void __exit fb_console_exit(void); #else -static void fb_console_init(void) {} -static void fb_console_exit(void) {} +static inline void fb_console_init(void) {} +static inline void fb_console_exit(void) {} #endif #endif /* _LINUX_FBCON_H */
The newly introduced fb_console_init/exit declarations have a dummy alternative that is marked 'static' in the header but not inline, leading to a warning whenever the header gets included: In file included from drivers/video/fbdev/core/fbmem.c:35:0: include/linux/fbcon.h:9:13: error: 'fb_console_exit' defined but not used [-Werror=unused-function] This adds the intended 'inline'. Fixes: 6104c37094e7 ("fbcon: Make fbcon a built-time depency for fbdev") Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- include/linux/fbcon.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.9.0