[PATCH 25/34] __initdata cleanup - input

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

diff -urNp linux-2.6.20-rc6-mm3.org/drivers/input/joystick/db9.c linux-2.6.20-rc6-mm3/drivers/input/joystick/db9.c
--- linux-2.6.20-rc6-mm3.org/drivers/input/joystick/db9.c 2007-01-25 04:19:28.000000000 +0200
+++ linux-2.6.20-rc6-mm3/drivers/input/joystick/db9.c 2007-01-31 23:18:42.000000000 +0200
@@ -50,7 +50,7 @@ struct db9_config {
};

#define DB9_MAX_PORTS 3
-static struct db9_config db9[DB9_MAX_PORTS] __initdata;
+static struct db9_config db9[DB9_MAX_PORTS] __initdata = {{{0}}};

module_param_array_named(dev, db9[0].args, int, &db9[0].nargs, 0);
MODULE_PARM_DESC(dev, "Describes first attached device (<parport#>,<type>)");
diff -urNp linux-2.6.20-rc6-mm3.org/drivers/input/joystick/gamecon.c linux-2.6.20-rc6-mm3/drivers/input/joystick/gamecon.c
--- linux-2.6.20-rc6-mm3.org/drivers/input/joystick/gamecon.c 2007-01-25 04:19:28.000000000 +0200
+++ linux-2.6.20-rc6-mm3/drivers/input/joystick/gamecon.c 2007-01-31 23:18:54.000000000 +0200
@@ -51,7 +51,7 @@ struct gc_config {
int nargs;
};

-static struct gc_config gc[GC_MAX_PORTS] __initdata;
+static struct gc_config gc[GC_MAX_PORTS] __initdata = {{{0}}};

module_param_array_named(map, gc[0].args, int, &gc[0].nargs, 0);
MODULE_PARM_DESC(map, "Describes first set of devices (<parport#>,<pad1>,<pad2>,..<pad5>)");
diff -urNp linux-2.6.20-rc6-mm3.org/drivers/input/joystick/turbografx.c linux-2.6.20-rc6-mm3/drivers/input/joystick/turbografx.c
--- linux-2.6.20-rc6-mm3.org/drivers/input/joystick/turbografx.c 2007-01-25 04:19:28.000000000 +0200
+++ linux-2.6.20-rc6-mm3/drivers/input/joystick/turbografx.c 2007-01-31 23:19:07.000000000 +0200
@@ -51,7 +51,7 @@ struct tgfx_config {
int nargs;
};

-static struct tgfx_config tgfx[TGFX_MAX_PORTS] __initdata;
+static struct tgfx_config tgfx[TGFX_MAX_PORTS] __initdata = {{{0}}};

module_param_array_named(map, tgfx[0].args, int, &tgfx[0].nargs, 0);
MODULE_PARM_DESC(map, "Describes first set of devices (<parport#>,<js1>,<js2>,..<js7>");
diff -urNp linux-2.6.20-rc6-mm3.org/drivers/input/keyboard/amikbd.c linux-2.6.20-rc6-mm3/drivers/input/keyboard/amikbd.c
--- linux-2.6.20-rc6-mm3.org/drivers/input/keyboard/amikbd.c 2007-01-25 04:19:28.000000000 +0200
+++ linux-2.6.20-rc6-mm3/drivers/input/keyboard/amikbd.c 2007-01-31 22:19:30.000000000 +0200
@@ -215,7 +215,7 @@ static int __init amikbd_init(void)
set_bit(i, amikbd_dev->keybit);

for (i = 0; i < MAX_NR_KEYMAPS; i++) {
- static u_short temp_map[NR_KEYS] __initdata;
+ static u_short temp_map[NR_KEYS] __initdata = {0};
if (!key_maps[i])
continue;
memset(temp_map, 0, sizeof(temp_map));