Re: [PATCH 03/20] fbcon: Convert struct font_desc to use ISO C initializers

[Geert Uytterhoeven <geert@linux-m68k.org>]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: TEXT/PLAIN; charset=UTF-8, Size: 3237 bytes --]

On Sun, 26 Aug 2007, Antonino A. Daplas wrote:
> From: Ralf Baechle <ralf@linux-mips.org>
> 
> Akpm's patch "newport_con warning fix" got me to look at the console
> drivers again and one thing that I noticed was that none of the fonts
> was using ISO initializers for it's fonts.
> 
> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
> Signed-off-by: Antonino Daplas <adaplas@gmail.com>

> diff --git a/drivers/video/backlight/cr_bllcd.c b/drivers/video/backlight/cr_bllcd.c
> index 92e201e..96f2307 100644
> --- a/drivers/video/backlight/cr_bllcd.c
> +++ b/drivers/video/backlight/cr_bllcd.c
> @@ -25,6 +25,7 @@
>   * Authors:
>   *   Thomas Hellstrom <thomas-at-tungstengraphics-dot-com>
>   *   Alan Hourihane <alanh-at-tungstengraphics-dot-com>
> + *   Michel Dänzer <michel-at-tungstengraphics-dot-com>
>   */
>  
>  #include <linux/module.h>
> @@ -38,6 +39,8 @@ #include <linux/lcd.h>
>  #include <linux/pci.h>
>  #include <asm/uaccess.h>
>  
> +#define MODULE_NAME "cr_bllcd"
> +
>  /* The LVDS- and panel power controls sits on the
>   * GPIO port of the ISA bridge.
>   */
> @@ -51,19 +54,25 @@ #define CRVML_LVDS_ON       0x00000001
>  #define CRVML_PANEL_ON      0x00000002
>  #define CRVML_BACKLIGHT_OFF 0x00000004
>  
> -/* The PLL Clock register sits on Host bridge */
> -#define CRVML_DEVICE_MCH   0x5001
> -#define CRVML_REG_MCHBAR   0x44
> -#define CRVML_REG_MCHEN    0x54
> -#define CRVML_MCHEN_BIT    (1 << 28)
> -#define CRVML_MCHMAP_SIZE  4096
> -#define CRVML_REG_CLOCK    0xc3c
> -#define CRVML_CLOCK_SHIFT  8
> -#define CRVML_CLOCK_MASK   0x00000f00
> -
>  static struct pci_dev *lpc_dev;
>  static u32 gpio_bar;
>  
> +#ifdef CONFIG_PM
> +
> +#define NUM_LPC_EXTRA_CONFIG_SPACE 45
> +static int lpc_saved_config_space[NUM_LPC_EXTRA_CONFIG_SPACE];
> +
> +#define CRVML_REG_RCBABAR   0xF0
> +#define CRVML_RCBAEN_BIT    (1 << 0)
> +#define CRVML_RCBAMAP_SIZE  16384
> +static u32 rcba_bar;
> +static void __iomem *rcba_regs_base;
> +
> +#define REGSAVE_SIZE (CRVML_RCBAMAP_SIZE + 4)
> +static u32 *regsave;
> +
> +#endif /* CONFIG_PM */
> +
>  struct cr_panel {
>  	struct backlight_device *cr_backlight_device;
>  	struct lcd_device *cr_lcd_device;

Doesn't look like C99 initializer conversions...

> diff --git a/drivers/video/console/font_10x18.c b/drivers/video/console/font_10x18.c
> index e6aa0ea..6be72bb 100644
> --- a/drivers/video/console/font_10x18.c
> +++ b/drivers/video/console/font_10x18.c
> @@ -5133,14 +5133,14 @@ static const unsigned char fontdata_10x1
>  
>  
>  const struct font_desc font_10x18 = {
> -	FONT10x18_IDX,
> -	"10x18",
> -	10,
> -	18,
> -	fontdata_10x18,
> +	.idx	= FONT10x18_IDX,
> +	.name	= "10x18",
> +	.width	= 10,
> +	.height	= 18,
> +	.data	= fontdata_10x18,
>  #ifdef __sparc__
> -	5
> +	.pref	= 5,
>  #else
> -	-1
> +	.pref	= -1,
>  #endif
>  };

This does.

Gr{oetje,eeting}s,

						Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
							    -- Linus Torvalds

[-- Attachment #2: Type: text/plain, Size: 315 bytes --]

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

[-- Attachment #3: Type: text/plain, Size: 182 bytes --]

_______________________________________________
Linux-fbdev-devel mailing list
Linux-fbdev-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-fbdev-devel