[PARISC] Update parisc specific input code from parisc tree

Update drivers to new input layer changes.

Signed-off-by: Helge Deller <deller@parisc-linux.org>
Signed-off-by: Matthew Wilcox <willy@parisc-linux.org>

Reorder code in gscps2_interrupt() and only enable ports when opened.
This fixes issues with hangs booting an SMP kernel on my C360.
Previously serio_interrupt() could be called before the lock in
struct serio was initialised.

Signed-off-by: Richard Hirst <rhirst@parisc-linux.org>

Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>

9 files changed, 1011 insertions, 31 deletions

diff --git a/drivers/input/keyboard/hil_kbd.c b/drivers/input/keyboard/hil_kbd.c
index ef78bffed5e7..0a90962c38e7 100644
--- a/drivers/input/keyboard/hil_kbd.c
+++ b/drivers/input/keyboard/hil_kbd.c
@@ -204,7 +204,7 @@ static irqreturn_t hil_kbd_interrupt(struct serio *serio,
         hil_packet packet;
         int idx;
 
-        kbd = (struct hil_kbd *)serio->private;
+        kbd = serio_get_drvdata(serio);
         if (kbd == NULL) {
                 BUG();
                 return IRQ_HANDLED;
@@ -234,7 +234,7 @@ static void hil_kbd_disconnect(struct serio *serio)
 {
         struct hil_kbd *kbd;
 
-        kbd = (struct hil_kbd *)serio->private;
+        kbd = serio_get_drvdata(serio);
         if (kbd == NULL) {
                 BUG();
                 return;
@@ -245,20 +245,20 @@ static void hil_kbd_disconnect(struct serio *serio)
         kfree(kbd);
 }
 
-static void hil_kbd_connect(struct serio *serio, struct serio_driver *drv)
+static int hil_kbd_connect(struct serio *serio, struct serio_driver *drv)
 {
         struct hil_kbd  *kbd;
         uint8_t         did, *idd;
         int             i;
         
-        if (serio->type != (SERIO_HIL_MLC | SERIO_HIL)) return;
-
-        if (!(kbd = kmalloc(sizeof(struct hil_kbd), GFP_KERNEL))) return;
+        kbd = kmalloc(sizeof(*kbd), GFP_KERNEL);
+        if (!kbd)
+                return -ENOMEM;
         memset(kbd, 0, sizeof(struct hil_kbd));
 
         if (serio_open(serio, drv)) goto bail0;
 
-        serio->private = kbd;
+        serio_set_drvdata(serio, kbd);
         kbd->serio = serio;
         kbd->dev.private = kbd;
 
@@ -342,19 +342,31 @@ static void hil_kbd_connect(struct serio *serio, struct serio_driver *drv)
         down(&(kbd->sem));
         up(&(kbd->sem));
 
-        return;
+        return 0;
  bail1:
         serio_close(serio);
  bail0:
         kfree(kbd);
+        serio_set_drvdata(serio, NULL);
+        return -EIO;
 }
 
+static struct serio_device_id hil_kbd_ids[] = {
+        {
+                .type = SERIO_HIL_MLC,
+                .proto = SERIO_HIL,
+                .id = SERIO_ANY,
+                .extra = SERIO_ANY,
+        },
+        { 0 }
+};
 
 struct serio_driver hil_kbd_serio_drv = {
         .driver         = {
                 .name   = "hil_kbd",
         },
         .description    = "HP HIL keyboard driver",
+        .id_table       = hil_kbd_ids,
         .connect        = hil_kbd_connect,
         .disconnect     = hil_kbd_disconnect,
         .interrupt      = hil_kbd_interrupt
diff --git a/drivers/input/keyboard/hilkbd.c b/drivers/input/keyboard/hilkbd.c
index e7a1e14f8b0c..e95bc052e32a 100644
--- a/drivers/input/keyboard/hilkbd.c
+++ b/drivers/input/keyboard/hilkbd.c
@@ -22,7 +22,7 @@
 #include <linux/errno.h>
 #include <linux/input.h>
 #include <linux/init.h>
-#include <linux/irq.h>
+#include <linux/interrupt.h>
 #include <linux/hil.h>
 #include <linux/spinlock.h>
 
diff --git a/drivers/input/mouse/hil_ptr.c b/drivers/input/mouse/hil_ptr.c
index bc22849c6c79..c2bf2ed07dc6 100644
--- a/drivers/input/mouse/hil_ptr.c
+++ b/drivers/input/mouse/hil_ptr.c
@@ -196,7 +196,7 @@ static irqreturn_t hil_ptr_interrupt(struct serio *serio,
         hil_packet packet;
         int idx;
 
-        ptr = (struct hil_ptr *)serio->private;
+        ptr = serio_get_drvdata(serio);
         if (ptr == NULL) {
                 BUG();
                 return IRQ_HANDLED;
@@ -227,7 +227,7 @@ static void hil_ptr_disconnect(struct serio *serio)
 {
         struct hil_ptr *ptr;
 
-        ptr = (struct hil_ptr *)serio->private;
+        ptr = serio_get_drvdata(serio);
         if (ptr == NULL) {
                 BUG();
                 return;
@@ -238,21 +238,19 @@ static void hil_ptr_disconnect(struct serio *serio)
         kfree(ptr);
 }
 
-static void hil_ptr_connect(struct serio *serio, struct serio_driver *driver)
+static int hil_ptr_connect(struct serio *serio, struct serio_driver *driver)
 {
         struct hil_ptr  *ptr;
         char            *txt;
         unsigned int    i, naxsets, btntype;
         uint8_t         did, *idd;
 
-        if (serio->type != (SERIO_HIL_MLC | SERIO_HIL)) return;
-
-        if (!(ptr = kmalloc(sizeof(struct hil_ptr), GFP_KERNEL))) return;
+        if (!(ptr = kmalloc(sizeof(struct hil_ptr), GFP_KERNEL))) return -ENOMEM;
         memset(ptr, 0, sizeof(struct hil_ptr));
 
         if (serio_open(serio, driver)) goto bail0;
 
-        serio->private = ptr;
+        serio_set_drvdata(serio, ptr);
         ptr->serio = serio;
         ptr->dev.private = ptr;
 
@@ -380,23 +378,34 @@ static void hil_ptr_connect(struct serio *serio, struct serio_driver *driver)
                 (btntype == BTN_MOUSE) ? "HIL mouse":"HIL tablet or touchpad",
                 did);
 
-        return;
+        return 0;