diff options
| author | Dmitry Torokhov <dtor@insightbb.com> | 2006-07-19 07:13:26 +0200 |
|---|---|---|
| committer | Dmitry Torokhov <dtor@insightbb.com> | 2006-07-19 07:13:26 +0200 |
| commit | 2b192908b8e74ce0753c7dff92d244735d1eeed9 (patch) | |
| tree | 022ef1586870ce78f7aaed9b713e740c46be1cd1 | |
| parent | Input: hiddev - use standard list implementation (diff) | |
| download | linux-2b192908b8e74ce0753c7dff92d244735d1eeed9.tar.xz linux-2b192908b8e74ce0753c7dff92d244735d1eeed9.zip | |
Input: keyboard - remove static variable and clean up initialization
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| -rw-r--r-- | drivers/char/keyboard.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/drivers/char/keyboard.c b/drivers/char/keyboard.c index 1e946f585673..1120586619ab 100644 --- a/drivers/char/keyboard.c +++ b/drivers/char/keyboard.c @@ -107,7 +107,6 @@ const int NR_TYPES = ARRAY_SIZE(max_vals); struct kbd_struct kbd_table[MAX_NR_CONSOLES]; static struct kbd_struct *kbd = kbd_table; -static struct kbd_struct kbd0; int spawnpid, spawnsig; @@ -1347,15 +1346,15 @@ int __init kbd_init(void) { int i; - kbd0.ledflagstate = kbd0.default_ledflagstate = KBD_DEFLEDS; - kbd0.ledmode = LED_SHOW_FLAGS; - kbd0.lockstate = KBD_DEFLOCK; - kbd0.slockstate = 0; - kbd0.modeflags = KBD_DEFMODE; - kbd0.kbdmode = VC_XLATE; - - for (i = 0 ; i < MAX_NR_CONSOLES ; i++) - kbd_table[i] = kbd0; + for (i = 0; i < MAX_NR_CONSOLES; i++) { + kbd_table[i].ledflagstate = KBD_DEFLEDS; + kbd_table[i].default_ledflagstate = KBD_DEFLEDS; + kbd_table[i].ledmode = LED_SHOW_FLAGS; + kbd_table[i].lockstate = KBD_DEFLOCK; + kbd_table[i].slockstate = 0; + kbd_table[i].modeflags = KBD_DEFMODE; + kbd_table[i].kbdmode = VC_XLATE; + } input_register_handler(&kbd_handler); |