4 files changed, 27 insertions, 25 deletions

diff --git a/drivers/input/serio/gscps2.c b/drivers/input/serio/gscps2.c
index 897e4c12b642..a7b0de0f92b2 100644
--- a/drivers/input/serio/gscps2.c
+++ b/drivers/input/serio/gscps2.c
@@ -211,9 +211,6 @@ static void gscps2_reset(struct gscps2port *ps2port)
         writeb(0xff, addr+GSC_RESET);
         gscps2_flush(ps2port);
         spin_unlock_irqrestore(&ps2port->lock, flags);
-
-        /* enable it */
-        gscps2_enable(ps2port, ENABLE);
 }
 
 static LIST_HEAD(ps2port_list);
@@ -307,6 +304,9 @@ static int gscps2_open(struct serio *port)
 
         gscps2_reset(ps2port);
 
+        /* enable it */
+        gscps2_enable(ps2port, ENABLE);
+
         gscps2_interrupt(0, NULL, NULL);
 
         return 0;
@@ -331,7 +331,7 @@ static int __init gscps2_probe(struct parisc_device *dev)
 {
         struct gscps2port *ps2port;
         struct serio *serio;
-        unsigned long hpa = dev->hpa;
+        unsigned long hpa = dev->hpa.start;
         int ret;
 
         if (!dev->irq)
@@ -370,8 +370,6 @@ static int __init gscps2_probe(struct parisc_device *dev)
         serio->port_data        = ps2port;
         serio->dev.parent       = &dev->dev;
 
-        list_add_tail(&ps2port->node, &ps2port_list);
-
         ret = -EBUSY;
         if (request_irq(dev->irq, gscps2_interrupt, SA_SHIRQ, ps2port->port->name, ps2port))
                 goto fail_miserably;
@@ -396,15 +394,16 @@ static int __init gscps2_probe(struct parisc_device *dev)
 
         serio_register_port(ps2port->port);
 
+        list_add_tail(&ps2port->node, &ps2port_list);
+
         return 0;
 
 fail:
         free_irq(dev->irq, ps2port);
 
 fail_miserably:
-        list_del(&ps2port->node);
         iounmap(ps2port->addr);
-        release_mem_region(dev->hpa, GSC_STATUS + 4);
+        release_mem_region(dev->hpa.start, GSC_STATUS + 4);
 
 fail_nomem:
         kfree(ps2port);
@@ -444,7 +443,7 @@ static struct parisc_device_id gscps2_device_tbl[] = {
 };
 
 static struct parisc_driver parisc_ps2_driver = {
-        .name           = "GSC PS2",
+        .name           = "gsc_ps2",
         .id_table       = gscps2_device_tbl,
         .probe          = gscps2_probe,
         .remove         = gscps2_remove,
diff --git a/drivers/input/serio/hil_mlc.c b/drivers/input/serio/hil_mlc.c
index c243cb6fdfc4..5704204964a3 100644
--- a/drivers/input/serio/hil_mlc.c
+++ b/drivers/input/serio/hil_mlc.c
@@ -801,7 +801,8 @@ static int hil_mlc_serio_open(struct serio *serio) {
         struct hil_mlc_serio_map *map;
         struct hil_mlc *mlc;
 
-        if (serio->private != NULL) return -EBUSY;
+        if (serio_get_drvdata(serio) != NULL)
+                return -EBUSY;
 
         map = serio->port_data;
         if (map == NULL) {
@@ -832,11 +833,18 @@ static void hil_mlc_serio_close(struct serio *serio) {
                 return;
         }
 
-        serio->private = NULL;
+        serio_set_drvdata(serio, NULL);
         serio->drv = NULL;
         /* TODO wake up interruptable */
 }
 
+static struct serio_device_id hil_mlc_serio_id = {
+        .type = SERIO_HIL_MLC,
+        .proto = SERIO_HIL,
+        .extra = SERIO_ANY,
+        .id = SERIO_ANY,
+};
+
 int hil_mlc_register(hil_mlc *mlc) {
         int i;
         unsigned long flags;
@@ -867,7 +875,7 @@ int hil_mlc_register(hil_mlc *mlc) {
                 mlc_serio = kmalloc(sizeof(*mlc_serio), GFP_KERNEL);
                 mlc->serio[i] = mlc_serio;
                 memset(mlc_serio, 0, sizeof(*mlc_serio));
-                mlc_serio->type                 = SERIO_HIL | SERIO_HIL_MLC;
+                mlc_serio->id                   = hil_mlc_serio_id;
                 mlc_serio->write                = hil_mlc_serio_write;
                 mlc_serio->open                 = hil_mlc_serio_open;
                 mlc_serio->close                = hil_mlc_serio_close;
diff --git a/drivers/input/serio/hp_sdc.c b/drivers/input/serio/hp_sdc.c
index 7629452dd64b..a10348bb25e9 100644
--- a/drivers/input/serio/hp_sdc.c
+++ b/drivers/input/serio/hp_sdc.c
@@ -764,7 +764,7 @@ MODULE_DEVICE_TABLE(parisc, hp_sdc_tbl);
 static int __init hp_sdc_init_hppa(struct parisc_device *d);
 
 static struct parisc_driver hp_sdc_driver = {
-        .name =         "HP SDC",
+        .name =         "hp_sdc",
         .id_table =     hp_sdc_tbl,
         .probe =        hp_sdc_init_hppa,
 };
@@ -875,9 +875,9 @@ static int __init hp_sdc_init_hppa(struct parisc_device *d)
         hp_sdc.dev              = d;
         hp_sdc.irq              = d->irq;
         hp_sdc.nmi              = d->aux_irq;
-        hp_sdc.base_io          = d->hpa;
-        hp_sdc.data_io          = d->hpa + 0x800;
-        hp_sdc.status_io        = d->hpa + 0x801;
+        hp_sdc.base_io          = d->hpa.start;
+        hp_sdc.data_io          = d->hpa.start + 0x800;
+        hp_sdc.status_io        = d->hpa.start + 0x801;
 
         return hp_sdc_init();
 }
diff --git a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c
index 40d451ce07ff..4bc40f159996 100644
--- a/drivers/input/serio/i8042.c
+++ b/drivers/input/serio/i8042.c
@@ -911,12 +911,10 @@ static long i8042_panic_blink(long count)
  * Here we try to restore the original BIOS settings
  */
 
-static int i8042_suspend(struct device *dev, pm_message_t state, u32 level)
+static int i8042_suspend(struct device *dev, pm_message_t state)
 {
-        if (level == SUSPEND_DISABLE) {
-                del_timer_sync(&i8042_timer);
-                i8042_controller_reset();
-        }
+        del_timer_sync(&i8042_timer);
+        i8042_controller_reset();
 
         return 0;
 }
@@ -926,13 +924,10 @@ static int i8042_suspend(struct device *dev, pm_message_t state, u32 level)
  * Here we try to reset everything back to a state in which suspended
  */
 
-static int i8042_resume(struct device *dev, u32 level)
+static int i8042_resume(struct device *dev)
 {
         int i;
 
-        if (level != RESUME_ENABLE)
-                return 0;
-
         if (i8042_ctl_test())
                 return -1;