Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[cascardo/linux.git] / drivers / input / keyboard / amikbd.c

diff --git a/drivers/input/keyboard/amikbd.c b/drivers/input/keyboard/amikbd.c
index d3b8c58..e04a3b4 100644 (file)
--- a/drivers/input/keyboard/amikbd.c
+++ b/drivers/input/keyboard/amikbd.c
@@ -45,6 +45,7 @@ MODULE_AUTHOR("Vojtech Pavlik <vojtech@ucw.cz>");
 MODULE_DESCRIPTION("Amiga keyboard driver");
 MODULE_LICENSE("GPL");
 
+#ifdef CONFIG_HW_CONSOLE
 static unsigned char amikbd_keycode[0x78] __initdata = {
        [0]      = KEY_GRAVE,
        [1]      = KEY_1,
@@ -144,6 +145,32 @@ static unsigned char amikbd_keycode[0x78] __initdata = {
        [103]    = KEY_RIGHTMETA
 };
 
+static void __init amikbd_init_console_keymaps(void)
+{
+       /* We can spare 512 bytes on stack for temp_map in init path. */
+       unsigned short temp_map[NR_KEYS];
+       int i, j;
+
+       for (i = 0; i < MAX_NR_KEYMAPS; i++) {
+               if (!key_maps[i])
+                       continue;
+               memset(temp_map, 0, sizeof(temp_map));
+               for (j = 0; j < 0x78; j++) {
+                       if (!amikbd_keycode[j])
+                               continue;
+                       temp_map[j] = key_maps[i][amikbd_keycode[j]];
+               }
+               for (j = 0; j < NR_KEYS; j++) {
+                       if (!temp_map[j])
+                               temp_map[j] = 0xf200;
+               }
+               memcpy(key_maps[i], temp_map, sizeof(temp_map));
+       }
+}
+#else /* !CONFIG_HW_CONSOLE */
+static inline void amikbd_init_console_keymaps(void) {}
+#endif /* !CONFIG_HW_CONSOLE */
+
 static const char *amikbd_messages[8] = {
        [0] = KERN_ALERT "amikbd: Ctrl-Amiga-Amiga reset warning!!\n",
        [1] = KERN_WARNING "amikbd: keyboard lost sync\n",
@@ -186,7 +213,7 @@ static irqreturn_t amikbd_interrupt(int irq, void *data)
 static int __init amikbd_probe(struct platform_device *pdev)
 {
        struct input_dev *dev;
-       int i, j, err;
+       int i, err;
 
        dev = input_allocate_device();
        if (!dev) {
@@ -207,22 +234,8 @@ static int __init amikbd_probe(struct platform_device *pdev)
        for (i = 0; i < 0x78; i++)
                set_bit(i, dev->keybit);
 
-       for (i = 0; i < MAX_NR_KEYMAPS; i++) {
-               static u_short temp_map[NR_KEYS] __initdata;
-               if (!key_maps[i])
-                       continue;
-               memset(temp_map, 0, sizeof(temp_map));
-               for (j = 0; j < 0x78; j++) {
-                       if (!amikbd_keycode[j])
-                               continue;
-                       temp_map[j] = key_maps[i][amikbd_keycode[j]];
-               }
-               for (j = 0; j < NR_KEYS; j++) {
-                       if (!temp_map[j])
-                               temp_map[j] = 0xf200;
-               }
-               memcpy(key_maps[i], temp_map, sizeof(temp_map));
-       }
+       amikbd_init_console_keymaps();
+
        ciaa.cra &= ~0x41;       /* serial data in, turn off TA */
        err = request_irq(IRQ_AMIGA_CIAA_SP, amikbd_interrupt, 0, "amikbd",
                          dev);