Merge branch 'next' into for-linus

Prepare input updates for 3.19.

4 files changed, 38 insertions, 61 deletions

diff --git a/drivers/input/serio/altera_ps2.c b/drivers/input/serio/altera_ps2.c
index 58781c8a8aec..f50325a03d4a 100644
--- a/drivers/input/serio/altera_ps2.c
+++ b/drivers/input/serio/altera_ps2.c
@@ -24,9 +24,7 @@
 
 struct ps2if {
         struct serio *io;
-        struct resource *iomem_res;
         void __iomem *base;
-        unsigned irq;
 };
 
 /*
@@ -83,16 +81,34 @@ static void altera_ps2_close(struct serio *io)
 static int altera_ps2_probe(struct platform_device *pdev)
 {
         struct ps2if *ps2if;
+        struct resource *res;
         struct serio *serio;
         int error, irq;
 
-        ps2if = kzalloc(sizeof(struct ps2if), GFP_KERNEL);
-        serio = kzalloc(sizeof(struct serio), GFP_KERNEL);
-        if (!ps2if || !serio) {
-                error = -ENOMEM;
-                goto err_free_mem;
+        ps2if = devm_kzalloc(&pdev->dev, sizeof(struct ps2if), GFP_KERNEL);
+        if (!ps2if)
+                return -ENOMEM;
+
+        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        ps2if->base = devm_ioremap_resource(&pdev->dev, res);
+        if (IS_ERR(ps2if->base))
+                return PTR_ERR(ps2if->base);
+
+        irq = platform_get_irq(pdev, 0);
+        if (irq < 0)
+                return -ENXIO;
+
+        error = devm_request_irq(&pdev->dev, irq, altera_ps2_rxint, 0,
+                                 pdev->name, ps2if);
+        if (error) {
+                dev_err(&pdev->dev, "could not request IRQ %d\n", irq);
+                return error;
         }
 
+        serio = kzalloc(sizeof(struct serio), GFP_KERNEL);
+        if (!serio)
+                return -ENOMEM;
+
         serio->id.type          = SERIO_8042;
         serio->write            = altera_ps2_write;
         serio->open             = altera_ps2_open;
@@ -103,56 +119,12 @@ static int altera_ps2_probe(struct platform_device *pdev)
         serio->dev.parent       = &pdev->dev;
         ps2if->io               = serio;
 
-        ps2if->iomem_res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        if (ps2if->iomem_res == NULL) {
-                error = -ENOENT;
-                goto err_free_mem;
-        }
-
-
-        irq = platform_get_irq(pdev, 0);
-        if (irq < 0) {
-                error = -ENXIO;
-                goto err_free_mem;
-        }
-        ps2if->irq = irq;
-
-        if (!request_mem_region(ps2if->iomem_res->start,
-                                resource_size(ps2if->iomem_res), pdev->name)) {
-                error = -EBUSY;
-                goto err_free_mem;
-        }
-
-        ps2if->base = ioremap(ps2if->iomem_res->start,
-                              resource_size(ps2if->iomem_res));
-        if (!ps2if->base) {
-                error = -ENOMEM;
-                goto err_free_res;
-        }
-
-        error = request_irq(ps2if->irq, altera_ps2_rxint, 0, pdev->name, ps2if);
-        if (error) {
-                dev_err(&pdev->dev, "could not allocate IRQ %d: %d\n",
-                        ps2if->irq, error);
-                goto err_unmap;
-        }
-
-        dev_info(&pdev->dev, "base %p, irq %d\n", ps2if->base, ps2if->irq);
+        dev_info(&pdev->dev, "base %p, irq %d\n", ps2if->base, irq);
 
         serio_register_port(ps2if->io);
         platform_set_drvdata(pdev, ps2if);
 
         return 0;
-
- err_unmap:
-        iounmap(ps2if->base);
- err_free_res:
-        release_mem_region(ps2if->iomem_res->start,
-                           resource_size(ps2if->iomem_res));
- err_free_mem:
-        kfree(ps2if);
-        kfree(serio);
-        return error;
 }
 
 /*
@@ -163,11 +135,6 @@ static int altera_ps2_remove(struct platform_device *pdev)
         struct ps2if *ps2if = platform_get_drvdata(pdev);
 
         serio_unregister_port(ps2if->io);
-        free_irq(ps2if->irq, ps2if);
-        iounmap(ps2if->base);
-        release_mem_region(ps2if->iomem_res->start,
-                           resource_size(ps2if->iomem_res));
-        kfree(ps2if);
 
         return 0;
 }
diff --git a/drivers/input/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-x86ia64io.h
index faeeb1372462..c66d1b53843e 100644
--- a/drivers/input/serio/i8042-x86ia64io.h
+++ b/drivers/input/serio/i8042-x86ia64io.h
@@ -579,6 +579,16 @@ static const struct dmi_system_id __initconst i8042_dmi_nopnp_table[] = {
                 },
         },
         {
+                /*
+                 * Intel NUC D54250WYK - does not have i8042 controller but
+                 * declares PS/2 devices in DSDT.
+                 */
+                .matches = {
+                        DMI_MATCH(DMI_BOARD_NAME, "D54250WYK"),
+                        DMI_MATCH(DMI_BOARD_VENDOR, "Intel Corporation"),
+                },
+        },
+        {
                 /* MSI Wind U-100 */
                 .matches = {
                         DMI_MATCH(DMI_BOARD_NAME, "U-100"),
diff --git a/drivers/input/serio/serio.c b/drivers/input/serio/serio.c
index d399b8b0f000..a05a5179da32 100644
--- a/drivers/input/serio/serio.c
+++ b/drivers/input/serio/serio.c
@@ -514,7 +514,7 @@ static void serio_release_port(struct device *dev)
  */
 static void serio_init_port(struct serio *serio)
 {
-        static atomic_t serio_no = ATOMIC_INIT(0);
+        static atomic_t serio_no = ATOMIC_INIT(-1);
 
         __module_get(THIS_MODULE);
 
@@ -525,7 +525,7 @@ static void serio_init_port(struct serio *serio)
         mutex_init(&serio->drv_mutex);
         device_initialize(&serio->dev);
         dev_set_name(&serio->dev, "serio%lu",
-                     (unsigned long)atomic_inc_return(&serio_no) - 1);
+                     (unsigned long)atomic_inc_return(&serio_no));
         serio->dev.bus = &serio_bus;
         serio->dev.release = serio_release_port;
         serio->dev.groups = serio_device_attr_groups;
diff --git a/drivers/input/serio/serio_raw.c b/drivers/input/serio/serio_raw.c
index c9a02fe57576..71ef5d65a0c6 100644
--- a/drivers/input/serio/serio_raw.c
+++ b/drivers/input/serio/serio_raw.c
@@ -292,7 +292,7 @@ static irqreturn_t serio_raw_interrupt(struct serio *serio, unsigned char data,
 
 static int serio_raw_connect(struct serio *serio, struct serio_driver *drv)
 {
-        static atomic_t serio_raw_no = ATOMIC_INIT(0);
+        static atomic_t serio_raw_no = ATOMIC_INIT(-1);
         struct serio_raw *serio_raw;
         int err;
 
@@ -303,7 +303,7 @@ static int serio_raw_connect(struct serio *serio, struct serio_driver *drv)
         }
 
         snprintf(serio_raw->name, sizeof(serio_raw->name),
-                 "serio_raw%ld", (long)atomic_inc_return(&serio_raw_no) - 1);
+                 "serio_raw%ld", (long)atomic_inc_return(&serio_raw_no));
         kref_init(&serio_raw->kref);
         INIT_LIST_HEAD(&serio_raw->client_list);
         init_waitqueue_head(&serio_raw->wait);