Merge branch 'next' into for-linus

3 files changed, 144 insertions, 135 deletions

diff --git a/drivers/input/keyboard/atkbd.c b/drivers/input/keyboard/atkbd.c
index 45470f18d7e9..f999dc60c3b8 100644
--- a/drivers/input/keyboard/atkbd.c
+++ b/drivers/input/keyboard/atkbd.c
@@ -229,7 +229,8 @@ struct atkbd {
 /*
  * System-specific ketymap fixup routine
  */
-static void (*atkbd_platform_fixup)(struct atkbd *);
+static void (*atkbd_platform_fixup)(struct atkbd *, const void *data);
+static void *atkbd_platform_fixup_data;
 
 static ssize_t atkbd_attr_show_helper(struct device *dev, char *buf,
                                 ssize_t (*handler)(struct atkbd *, char *));
@@ -834,87 +835,64 @@ static void atkbd_disconnect(struct serio *serio)
 }
 
 /*
- * Most special keys (Fn+F?) on Dell laptops do not generate release
- * events so we have to do it ourselves.
+ * generate release events for the keycodes given in data
  */
-static void atkbd_dell_laptop_keymap_fixup(struct atkbd *atkbd)
+static void atkbd_apply_forced_release_keylist(struct atkbd* atkbd,
+                                                const void *data)
 {
-        static const unsigned int forced_release_keys[] = {
-                0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8f, 0x93,
-        };
-        int i;
+        const unsigned int *keys = data;
+        unsigned int i;
 
         if (atkbd->set == 2)
-                for (i = 0; i < ARRAY_SIZE(forced_release_keys); i++)
-                        __set_bit(forced_release_keys[i],
-                                  atkbd->force_release_mask);
+                for (i = 0; keys[i] != -1U; i++)
+                        __set_bit(keys[i], atkbd->force_release_mask);
 }
 
 /*
+ * Most special keys (Fn+F?) on Dell laptops do not generate release
+ * events so we have to do it ourselves.
+ */
+static unsigned int atkbd_dell_laptop_forced_release_keys[] = {
+        0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8f, 0x93, -1U
+};
+
+/*
  * Perform fixup for HP system that doesn't generate release
  * for its video switch
  */
-static void atkbd_hp_keymap_fixup(struct atkbd *atkbd)
-{
-        static const unsigned int forced_release_keys[] = {
-                0x94,
-        };
-        int i;
-
-        if (atkbd->set == 2)
-                for (i = 0; i < ARRAY_SIZE(forced_release_keys); i++)
-                        __set_bit(forced_release_keys[i],
-                                        atkbd->force_release_mask);
-}
+static unsigned int atkbd_hp_forced_release_keys[] = {
+        0x94, -1U
+};
 
 /*
  * Inventec system with broken key release on volume keys
  */
-static void atkbd_inventec_keymap_fixup(struct atkbd *atkbd)
-{
-        const unsigned int forced_release_keys[] = {
-                0xae, 0xb0,
-        };
-        int i;
-
-        if (atkbd->set == 2)
-                for (i = 0; i < ARRAY_SIZE(forced_release_keys); i++)
-                        __set_bit(forced_release_keys[i],
-                                  atkbd->force_release_mask);
-}
+static unsigned int atkbd_inventec_forced_release_keys[] = {
+        0xae, 0xb0, -1U
+};
 
 /*
  * Perform fixup for HP Pavilion ZV6100 laptop that doesn't generate release
  * for its volume buttons
  */
-static void atkbd_hp_zv6100_keymap_fixup(struct atkbd *atkbd)
-{
-        const unsigned int forced_release_keys[] = {
-                0xae, 0xb0,
-        };
-        int i;
-
-        if (atkbd->set == 2)
-                for (i = 0; i < ARRAY_SIZE(forced_release_keys); i++)
-                        __set_bit(forced_release_keys[i],
-                                        atkbd->force_release_mask);
-}
+static unsigned int atkbd_hp_zv6100_forced_release_keys[] = {
+        0xae, 0xb0, -1U
+};
 
 /*
  * Samsung NC10 with Fn+F? key release not working
  */
-static void atkbd_samsung_keymap_fixup(struct atkbd *atkbd)
-{
-        const unsigned int forced_release_keys[] = {
-                0x82, 0x83, 0x84, 0x86, 0x88, 0x89, 0xb3, 0xf7, 0xf9,
-        };
-        int i;
+static unsigned int atkbd_samsung_forced_release_keys[] = {
+        0x82, 0x83, 0x84, 0x86, 0x88, 0x89, 0xb3, 0xf7, 0xf9, -1U
+};
 
-        if (atkbd->set == 2)
-                for (i = 0; i < ARRAY_SIZE(forced_release_keys); i++)
-                        __set_bit(forced_release_keys[i],
-                                  atkbd->force_release_mask);
-}
+/*
+ * The volume up and volume down special keys on a Fujitsu Amilo PA 1510 laptop
+ * do not generate release events so we have to do it ourselves.
+ */
+static unsigned int atkbd_amilo_pa1510_forced_release_keys[] = {
+        0xb0, 0xae, -1U
+};
 
 /*
  * atkbd_set_keycode_table() initializes keyboard's keycode table
@@ -967,7 +945,7 @@ static void atkbd_set_keycode_table(struct atkbd *atkbd)
  * Perform additional fixups
  */
         if (atkbd_platform_fixup)
-                atkbd_platform_fixup(atkbd);
+                atkbd_platform_fixup(atkbd, atkbd_platform_fixup_data);
 }
 
 /*
@@ -1492,9 +1470,11 @@ static ssize_t atkbd_show_err_count(struct atkbd *atkbd, char *buf)
         return sprintf(buf, "%lu\n", atkbd->err_count);
 }
 
-static int __init atkbd_setup_fixup(const struct dmi_system_id *id)
+static int __init atkbd_setup_forced_release(const struct dmi_system_id *id)
 {
-        atkbd_platform_fixup = id->driver_data;
+        atkbd_platform_fixup = atkbd_apply_forced_release_keylist;
+        atkbd_platform_fixup_data = id->driver_data;
+
         return 0;
 }
 
@@ -1505,8 +1485,8 @@ static struct dmi_system_id atkbd_dmi_quirk_table[] __initdata = {
                         DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
                         DMI_MATCH(DMI_CHASSIS_TYPE, "8"), /* Portable */
                 },
-                .callback = atkbd_setup_fixup,
-                .driver_data = atkbd_dell_laptop_keymap_fixup,
+                .callback = atkbd_setup_forced_release,
+                .driver_data = atkbd_dell_laptop_forced_release_keys,
         },
         {
                 .ident = "Dell Laptop",
@@ -1514,8 +1494,8 @@ static struct dmi_system_id atkbd_dmi_quirk_table[] __initdata = {
                         DMI_MATCH(DMI_SYS_VENDOR, "Dell Computer Corporation"),
                         DMI_MATCH(DMI_CHASSIS_TYPE, "8"), /* Portable */
                 },
-                .callback = atkbd_setup_fixup,
-                .driver_data = atkbd_dell_laptop_keymap_fixup,
+                .callback = atkbd_setup_forced_release,
+                .driver_data = atkbd_dell_laptop_forced_release_keys,
         },
         {
                 .ident = "HP 2133",
@@ -1523,8 +1503,8 @@ static struct dmi_system_id atkbd_dmi_quirk_table[] __initdata = {
                         DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),
                         DMI_MATCH(DMI_PRODUCT_NAME, "HP 2133"),
                 },
-                .callback = atkbd_setup_fixup,
-                .driver_data = atkbd_hp_keymap_fixup,
+                .callback = atkbd_setup_forced_release,
+                .driver_data = atkbd_hp_forced_release_keys,
         },
         {
                 .ident = "HP Pavilion ZV6100",
@@ -1532,8 +1512,8 @@ static struct dmi_system_id atkbd_dmi_quirk_table[] __initdata = {
                         DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),
                         DMI_MATCH(DMI_PRODUCT_NAME, "Pavilion ZV6100"),
                 },
-                .callback = atkbd_setup_fixup,
-                .driver_data = atkbd_hp_zv6100_keymap_fixup,
+                .callback = atkbd_setup_forced_release,
+                .driver_data = atkbd_hp_zv6100_forced_release_keys,
         },
         {
                 .ident = "Inventec Symphony",
@@ -1541,8 +1521,8 @@ static struct dmi_system_id atkbd_dmi_quirk_table[] __initdata = {
                         DMI_MATCH(DMI_SYS_VENDOR, "INVENTEC"),
                         DMI_MATCH(DMI_PRODUCT_NAME, "SYMPHONY 6.0/7.0"),
                 },
-                .callback = atkbd_setup_fixup,
-                .driver_data = atkbd_inventec_keymap_fixup,
+                .callback = atkbd_setup_forced_release,
+                .driver_data = atkbd_inventec_forced_release_keys,
         },
         {
                 .ident = "Samsung NC10",
@@ -1550,8 +1530,17 @@ static struct dmi_system_id atkbd_dmi_quirk_table[] __initdata = {
                         DMI_MATCH(DMI_SYS_VENDOR, "SAMSUNG ELECTRONICS CO., LTD."),
                         DMI_MATCH(DMI_PRODUCT_NAME, "NC10"),
                 },
-                .callback = atkbd_setup_fixup,
-                .driver_data = atkbd_samsung_keymap_fixup,
+                .callback = atkbd_setup_forced_release,
+                .driver_data = atkbd_samsung_forced_release_keys,
+        },
+        {
+                .ident = "Fujitsu Amilo PA 1510",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU SIEMENS"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "AMILO Pa 1510"),
+                },
+                .callback = atkbd_setup_forced_release,
+                .driver_data = atkbd_amilo_pa1510_forced_release_keys,
         },
         { }
 };
diff --git a/drivers/input/keyboard/bf54x-keys.c b/drivers/input/keyboard/bf54x-keys.c
index ee855c5202e8..e94b7d735aca 100644
--- a/drivers/input/keyboard/bf54x-keys.c
+++ b/drivers/input/keyboard/bf54x-keys.c
@@ -211,8 +211,8 @@ static int __devinit bfin_kpad_probe(struct platform_device *pdev)
 
         if (!pdata->debounce_time || pdata->debounce_time > MAX_MULT ||
             !pdata->coldrive_time || pdata->coldrive_time > MAX_MULT) {
-                printk(KERN_ERR DRV_NAME
-                        ": Invalid Debounce/Columdrive Time from pdata\n");
+                printk(KERN_WARNING DRV_NAME
+                        ": Invalid Debounce/Columndrive Time in platform data\n");
                 bfin_write_KPAD_MSEL(0xFF0);    /* Default MSEL */
         } else {
                 bfin_write_KPAD_MSEL(
diff --git a/drivers/input/keyboard/hilkbd.c b/drivers/input/keyboard/hilkbd.c
index aacf71f3cd44..e9d639ec283d 100644
--- a/drivers/input/keyboard/hilkbd.c
+++ b/drivers/input/keyboard/hilkbd.c
@@ -198,45 +198,28 @@ static void hil_do(unsigned char cmd, unsigned char *data, unsigned int len)
 }
 
 
-/* initialise HIL */
-static int __init
-hil_keyb_init(void)
+/* initialize HIL */
+static int __devinit hil_keyb_init(void)
 {
         unsigned char c;
         unsigned int i, kbid;
         wait_queue_head_t hil_wait;
         int err;
 
-        if (hil_dev.dev) {
+        if (hil_dev.dev)
                 return -ENODEV; /* already initialized */
-        }
 
+        init_waitqueue_head(&hil_wait);
         spin_lock_init(&hil_dev.lock);
+
         hil_dev.dev = input_allocate_device();
         if (!hil_dev.dev)
                 return -ENOMEM;
 
-#if defined(CONFIG_HP300)
-        if (!MACH_IS_HP300) {
-                err = -ENODEV;
-                goto err1;
-        }
-        if (!hwreg_present((void *)(HILBASE + HIL_DATA))) {
-                printk(KERN_ERR "HIL: hardware register was not found\n");
-                err = -ENODEV;
-                goto err1;
-        }
-        if (!request_region(HILBASE + HIL_DATA, 2, "hil")) {
-                printk(KERN_ERR "HIL: IOPORT region already used\n");
-                err = -EIO;
-                goto err1;
-        }
-#endif
-
         err = request_irq(HIL_IRQ, hil_interrupt, 0, "hil", hil_dev.dev_id);
         if (err) {
                 printk(KERN_ERR "HIL: Can't get IRQ\n");
-                goto err2;
+                goto err1;
         }
 
         /* Turn on interrupts */
@@ -246,11 +229,9 @@ hil_keyb_init(void)
         hil_dev.valid = 0;      /* clear any pending data */
         hil_do(HIL_READKBDSADR, NULL, 0);
 
-        init_waitqueue_head(&hil_wait);
-        wait_event_interruptible_timeout(hil_wait, hil_dev.valid, 3*HZ);
-        if (!hil_dev.valid) {
+        wait_event_interruptible_timeout(hil_wait, hil_dev.valid, 3 * HZ);
+        if (!hil_dev.valid)
                 printk(KERN_WARNING "HIL: timed out, assuming no keyboard present\n");
-        }
 
         c = hil_dev.c;
         hil_dev.valid = 0;
@@ -268,7 +249,7 @@ hil_keyb_init(void)
 
         for (i = 0; i < HIL_KEYCODES_SET1_TBLSIZE; i++)
                 if (hphilkeyb_keycode[i] != KEY_RESERVED)
-                        set_bit(hphilkeyb_keycode[i], hil_dev.dev->keybit);
+                        __set_bit(hphilkeyb_keycode[i], hil_dev.dev->keybit);
 
         hil_dev.dev->evbit[0]   = BIT_MASK(EV_KEY) | BIT_MASK(EV_REP);
         hil_dev.dev->ledbit[0]  = BIT_MASK(LED_NUML) | BIT_MASK(LED_CAPSL) |
@@ -287,34 +268,45 @@ hil_keyb_init(void)
         err = input_register_device(hil_dev.dev);
         if (err) {
                 printk(KERN_ERR "HIL: Can't register device\n");
-                goto err3;
+                goto err2;
         }
+
         printk(KERN_INFO "input: %s, ID %d at 0x%08lx (irq %d) found and attached\n",
                hil_dev.dev->name, kbid, HILBASE, HIL_IRQ);
 
         return 0;
 
-err3:
+err2:
         hil_do(HIL_INTOFF, NULL, 0);
-        disable_irq(HIL_IRQ);
         free_irq(HIL_IRQ, hil_dev.dev_id);
-err2:
-#if defined(CONFIG_HP300)
-        release_region(HILBASE + HIL_DATA, 2);
 err1:
-#endif
         input_free_device(hil_dev.dev);
         hil_dev.dev = NULL;
         return err;
 }
 
+static void __devexit hil_keyb_exit(void)
+{
+        if (HIL_IRQ)
+                free_irq(HIL_IRQ, hil_dev.dev_id);
+
+        /* Turn off interrupts */
+        hil_do(HIL_INTOFF, NULL, 0);
+
+        input_unregister_device(hil_dev.dev);
+        hil_dev.dev = NULL;
+}
 
 #if defined(CONFIG_PARISC)
-static int __init
-hil_init_chip(struct parisc_device *dev)
+static int __devinit hil_probe_chip(struct parisc_device *dev)
 {
+        /* Only allow one HIL keyboard */
+        if (hil_dev.dev)
+                return -ENODEV;
+
         if (!dev->irq) {
-                printk(KERN_WARNING "HIL: IRQ not found for HIL bus at 0x%08lx\n", dev->hpa.start);
+                printk(KERN_WARNING "HIL: IRQ not found for HIL bus at 0x%p\n",
+                        (void *)dev->hpa.start);
                 return -ENODEV;
         }
 
@@ -327,51 +319,79 @@ hil_init_chip(struct parisc_device *dev)
         return hil_keyb_init();
 }
 
+static int __devexit hil_remove_chip(struct parisc_device *dev)
+{
+        hil_keyb_exit();
+
+        return 0;
+}
+
 static struct parisc_device_id hil_tbl[] = {
         { HPHW_FIO, HVERSION_REV_ANY_ID, HVERSION_ANY_ID, 0x00073 },
         { 0, }
 };
 
+#if 0
+/* Disabled to avoid conflicts with the HP SDC HIL drivers */
 MODULE_DEVICE_TABLE(parisc, hil_tbl);
+#endif
 
 static struct parisc_driver hil_driver = {
-        .name =         "hil",
-        .id_table =     hil_tbl,
-        .probe =        hil_init_chip,
+        .name           = "hil",
+        .id_table       = hil_tbl,
+        .probe          = hil_probe_chip,
+        .remove         = __devexit_p(hil_remove_chip),
 };
-#endif /* CONFIG_PARISC */
-
 
 static int __init hil_init(void)
 {
-#if defined(CONFIG_PARISC)
         return register_parisc_driver(&hil_driver);
-#else
-        return hil_keyb_init();
-#endif
 }
 
-
 static void __exit hil_exit(void)
 {
-        if (HIL_IRQ) {
-                disable_irq(HIL_IRQ);
-                free_irq(HIL_IRQ, hil_dev.dev_id);
+        unregister_parisc_driver(&hil_driver);
+}
+
+#else /* !CONFIG_PARISC */
+
+static int __init hil_init(void)
+{
+        int error;
+
+        /* Only allow one HIL keyboard */
+        if (hil_dev.dev)
+                return -EBUSY;
+
+        if (!MACH_IS_HP300)
+                return -ENODEV;
+
+        if (!hwreg_present((void *)(HILBASE + HIL_DATA))) {
+                printk(KERN_ERR "HIL: hardware register was not found\n");
+                return -ENODEV;
         }
 
-        /* Turn off interrupts */
-        hil_do(HIL_INTOFF, NULL, 0);
+        if (!request_region(HILBASE + HIL_DATA, 2, "hil")) {
+                printk(KERN_ERR "HIL: IOPORT region already used\n");
+                return -EIO;
+        }
 
-        input_unregister_device(hil_dev.dev);
+        error = hil_keyb_init();
+        if (error) {
+                release_region(HILBASE + HIL_DATA, 2);
+                return error;
+        }
 
-        hil_dev.dev = NULL;
+        return 0;
+}
 
-#if defined(CONFIG_PARISC)
-        unregister_parisc_driver(&hil_driver);
-#else
-        release_region(HILBASE+HIL_DATA, 2);
-#endif
+static void __exit hil_exit(void)
+{
+        hil_keyb_exit();
+        release_region(HILBASE + HIL_DATA, 2);
 }
 
+#endif /* CONFIG_PARISC */
+
 module_init(hil_init);
 module_exit(hil_exit);