fbcon: Kill compile warning
Subsystems (2)
PATCH 1/11 fbcon: Kill compile warning
Fix compile warning ('map_override unused') if fbcon is compiled as a module and CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=n.
---
drivers/video/console/fbcon.c | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-)
drivers/video/console/fbcon.c +11 -1
@@ -127,8 +127,18 @@ static int last_fb_vc = MAX_NR_CONSOLESstatic int fbcon_is_default =1 ;static int fbcon_has_exited;static int primary_device =-1 ; + +#ifdef CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY static int map_override; +static inline void fbcon_map_override (void ) +{ + map_override =1 ; +} +#else +#define fbcon_map_override (...) do { } while (0) +#endif /* CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY */ +/* font data */ static char fontname[40 ];
@@ -506,7 +516,7 @@ static int __init fb_console_setup(char (options[j++]-'0' ) %FB_MAX ; } - map_override =1 ; +fbcon_map_override (); }return 1 ;
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/
drivers/video/console/fbcon.c static int last_fb_vc = MAX_NR_CONSOLES · line 140
Quoted 7 lines · On Wed, 01 Aug 2007 15:33:09 +0800 "Antonino A. Daplas" <[email protected]>…
drivers/video/console/fbcon.c +7
-0+static inline void fbcon_map_override (void ) +{ + map_override =1 ; +} +#else +#define fbcon_map_override (...) do { } while (0) +#endif /* CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY */
It's odd to use a C function in one case and a macro in the other. Was there a reason to not use plain old static inline?
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/
Quoted 13 lines · Andrew Morton
drivers/video/console/fbcon.c static int last_fb_vc = MAX_NR_CONSOLES · line 140
Quoted 7 lines · On Wed, 01 Aug 2007 15:33:09 +0800 "Antonino A. Daplas" <[email protected]>…
drivers/video/console/fbcon.c +7
-0+static inline void fbcon_map_override (void ) +{ + map_override =1 ; +} +#else +#define fbcon_map_override (...) do { } while (0) +#endif /* CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY */ It's odd to use a C function in one case and a macro in the other. Was there a reason to not use plain old static inline?
No reason, an empty inline function is fine with me too.
Tony
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/