[PATCH 01/11] fbcon: Kill compile warning

[PATCH 01/11] fbcon: Kill compile warning

[Antonino A. Daplas]

Fix compile warning ('map_override unused') if fbcon is compiled as a 
module and CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=n.

Signed-off-by: Antonino Daplas <adaplas@gmail.com>
---

 drivers/video/console/fbcon.c |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c
index decfdc8..08f4dd0 100644
--- a/drivers/video/console/fbcon.c
+++ b/drivers/video/console/fbcon.c
@@ -127,8 +127,18 @@ static int last_fb_vc = MAX_NR_CONSOLES 
 static 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/

Re: [PATCH 01/11] fbcon: Kill compile warning

[Andrew Morton]

On Wed, 01 Aug 2007 15:33:09 +0800
"Antonino A. Daplas" <adaplas@gmail.com> wrote:

> +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/

Re: [PATCH 01/11] fbcon: Kill compile warning

[Antonino A. Daplas]

On Wed, 2007-08-01 at 15:41 -0700, Andrew Morton wrote:
> On Wed, 01 Aug 2007 15:33:09 +0800
> "Antonino A. Daplas" <adaplas@gmail.com> wrote:
> 
> > +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/