Re: [PATCH] Fix fbcon - 'map_override' defined but not used warning

[Gabriel C <nix.or.die@googlemail.com>]

Antonino A. Daplas wrote:
> On Sun, 2007-07-22 at 18:23 +0200, Gabriel C wrote:
>> Hi,
>>
>> I got this warning on current git:
>>
>> ...
>>
>> drivers/video/console/fbcon.c:130: warning: 'map_override' defined but not used
>>
>> ...
>>
>> Signed-off-by: Gabriel Craciunescu <nix.or.die@googlemail.com>
>>
>> ---
>>
>> diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c
>> index decfdc8..60a14de 100644
>> --- a/drivers/video/console/fbcon.c
>> +++ b/drivers/video/console/fbcon.c
>> @@ -127,7 +127,9 @@ static int last_fb_vc = MAX_NR_CONSOLES - 1;
>>  static int fbcon_is_default = 1; 
>>  static int fbcon_has_exited;
>>  static int primary_device = -1;
>> +#ifndef MODULE
> 
> Disrecard my other comment. This should be
> 
> #ifdef CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY

You really sure ? 

With that you have an compile error with !MODULE && !CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY

You are using that code checking !MODULE and you check !map_override with CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY

...

#ifndef MODULE
static int __init fb_console_setup(char *this_opt)
{
...
		      con2fb_map_boot[i] =
                                                (options[j++]-'0') % FB_MAX;
                                }

                                map_override = 1; <-- should die here with !CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY && !MODULE
                        }

                        return 1;
                }

...

#endif


> 
>>  static int map_override;
>> +#endif
>>  
>>  /* font data */
>>  static char fontname[40];
> 
> Tony
> 
> 

Gabriel