[PATCH 34/34] __initdata cleanup - video

Alon Bar-Lev
2007-02-09T15:39:24Z

diff -urNp linux-2.6.20-rc6-mm3.org/drivers/video/console/sticore.c linux-2.6.20-rc6-mm3/drivers/video/console/sticore.c
--- linux-2.6.20-rc6-mm3.org/drivers/video/console/sticore.c
+++ linux-2.6.20-rc6-mm3/drivers/video/console/sticore.c
@@ -289,9 +289,9 @@ __setup("sti=", sti_setup);

static char __initdata *font_name[MAX_STI_ROMS] = { "VGA8x16", };
-static int __initdata font_index[MAX_STI_ROMS],
- font_height[MAX_STI_ROMS],
- font_width[MAX_STI_ROMS];
+static int __initdata font_index[MAX_STI_ROMS] = {0},
+ font_height[MAX_STI_ROMS] = {0},
+ font_width[MAX_STI_ROMS] = {0};
#ifndef MODULE
static int __init sti_font_setup(char *str)
{
diff -urNp linux-2.6.20-rc6-mm3.org/drivers/video/skeletonfb.c linux-2.6.20-rc6-mm3/drivers/video/skeletonfb.c
--- linux-2.6.20-rc6-mm3.org/drivers/video/skeletonfb.c
+++ linux-2.6.20-rc6-mm3/drivers/video/skeletonfb.c
@@ -123,7 +123,7 @@ static struct fb_info info;
* Each one represents the state of the hardware. Most hardware have
* just one hardware state. These here represent the default state(s).
*/
-static struct xxx_par __initdata current_par;
+static struct xxx_par __initdata current_par = {0};

int xxxfb_init(void);
int xxxfb_setup(char*);
diff -urNp linux-2.6.20-rc6-mm3.org/drivers/video/stifb.c linux-2.6.20-rc6-mm3/drivers/video/stifb.c
--- linux-2.6.20-rc6-mm3.org/drivers/video/stifb.c
+++ linux-2.6.20-rc6-mm3/drivers/video/stifb.c
@@ -111,7 +111,7 @@ struct stifb_info {
u32 pseudo_palette[16];
};

-static int __initdata stifb_bpp_pref[MAX_STI_ROMS];
+static int __initdata stifb_bpp_pref[MAX_STI_ROMS] = {0};

/* ------------------- chipset specific functions -------------------------- */

@@ -1298,7 +1298,7 @@ out_err0:
return -ENXIO;
}

-static int stifb_disabled __initdata;
+static int stifb_disabled __initdata = 0;

int __init
stifb_setup(char *options);
diff -urNp linux-2.6.20-rc6-mm3.org/drivers/video/vesafb.c linux-2.6.20-rc6-mm3/drivers/video/vesafb.c
--- linux-2.6.20-rc6-mm3.org/drivers/video/vesafb.c
+++ linux-2.6.20-rc6-mm3/drivers/video/vesafb.c
@@ -49,8 +49,8 @@ static struct fb_fix_screeninfo vesafb_f

static int inverse __read_mostly;
static int mtrr __read_mostly; /* disable mtrr */
-static int vram_remap __initdata; /* Set amount of memory to be used */
-static int vram_total __initdata; /* Set total amount of memory */
+static int vram_remap __initdata = 0; /* Set amount of memory to be used */
+static int vram_total __initdata = 0; /* Set total amount of memory */
static int pmi_setpal __read_mostly = 1; /* pmi for palette changes ??? */
static int ypan __read_mostly; /* 0..nothing, 1..ypan, 2..ywrap */
static void (*pmi_start)(void) __read_mostly;