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

Pull input updates from Dmitry Torokhov:
 "A few new haptic/button drivers, a rudimentary support for laptops
  using FocalTech touchpads; xpad driver will bind to more devices, and
  a few other driver fixes."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: soc_button_array - convert to platform bus
  Input: palmas-pwrbutton - fix typo in the license string
  Input: palmas-pwrbutton - use IRQF_ONESHOT
  Input: psmouse - add support for detecting FocalTech PS/2 touchpads
  Input: psmouse - add psmouse_matches_pnp_id helper function
  Input: joystick - use ktime for measuring timing
  Input: add haptic driver on max77693
  Input: introduce palmas-pwrbutton
  Input: add support for the DRV2667 haptic driver
  Input: xpad - sync device IDs with xboxdrv
  Input: xpad - add VID/PID for Razer Sabertooth
  Input: cros_ec_keyb - optimize ghosting algorithm
  Input: drv260x - fix binding document
  Input: drv260x - add check for ERM mode and LRA Libraries
  Input: drv260x - remove unused defines
  Input: drv260x - add TI drv260x haptics driver

1 files changed, 31 insertions, 29 deletions

diff --git a/drivers/input/misc/soc_button_array.c b/drivers/input/misc/soc_button_array.c
index e34dfc29beb3..735604753568 100644
--- a/drivers/input/misc/soc_button_array.c
+++ b/drivers/input/misc/soc_button_array.c
@@ -18,7 +18,7 @@
 #include <linux/gpio/consumer.h>
 #include <linux/gpio_keys.h>
 #include <linux/platform_device.h>
-#include <linux/pnp.h>
+#include <linux/acpi.h>
 
 /*
  * Definition of buttons on the tablet. The ACPI index of each button
@@ -67,7 +67,7 @@ static int soc_button_lookup_gpio(struct device *dev, int acpi_index)
 }
 
 static struct platform_device *
-soc_button_device_create(struct pnp_dev *pdev,
+soc_button_device_create(struct platform_device *pdev,
                          const struct soc_button_info *button_info,
                          bool autorepeat)
 {
@@ -138,30 +138,40 @@ err_free_mem:
         return ERR_PTR(error);
 }
 
-static void soc_button_remove(struct pnp_dev *pdev)
+static int soc_button_remove(struct platform_device *pdev)
 {
-        struct soc_button_data *priv = pnp_get_drvdata(pdev);
+        struct soc_button_data *priv = platform_get_drvdata(pdev);
+
         int i;
 
         for (i = 0; i < BUTTON_TYPES; i++)
                 if (priv->children[i])
                         platform_device_unregister(priv->children[i]);
+
+        return 0;
 }
 
-static int soc_button_pnp_probe(struct pnp_dev *pdev,
-                                const struct pnp_device_id *id)
+static int soc_button_probe(struct platform_device *pdev)
 {
-        const struct soc_button_info *button_info = (void *)id->driver_data;
+        struct device *dev = &pdev->dev;
+        const struct acpi_device_id *id;
+        struct soc_button_info *button_info;
         struct soc_button_data *priv;
         struct platform_device *pd;
         int i;
         int error;
 
+        id = acpi_match_device(dev->driver->acpi_match_table, dev);
+        if (!id)
+                return -ENODEV;
+
+        button_info = (struct soc_button_info *)id->driver_data;
+
         priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL);
         if (!priv)
                 return -ENOMEM;
 
-        pnp_set_drvdata(pdev, priv);
+        platform_set_drvdata(pdev, priv);
 
         for (i = 0; i < BUTTON_TYPES; i++) {
                 pd = soc_button_device_create(pdev, button_info, i == 0);
@@ -192,30 +202,22 @@ static struct soc_button_info soc_button_PNP0C40[] = {
         { }
 };
 
-static const struct pnp_device_id soc_button_pnp_match[] = {
-        { .id = "PNP0C40", .driver_data = (long)soc_button_PNP0C40 },
-        { .id = "" }
+static const struct acpi_device_id soc_button_acpi_match[] = {
+        { "PNP0C40", (unsigned long)soc_button_PNP0C40 },
+        { }
 };
-MODULE_DEVICE_TABLE(pnp, soc_button_pnp_match);
 
-static struct pnp_driver soc_button_pnp_driver = {
-        .name           = KBUILD_MODNAME,
-        .id_table       = soc_button_pnp_match,
-        .probe          = soc_button_pnp_probe,
+MODULE_DEVICE_TABLE(acpi, soc_button_acpi_match);
+
+static struct platform_driver soc_button_driver = {
+        .probe          = soc_button_probe,
         .remove         = soc_button_remove,
+        .driver         = {
+                .name = KBUILD_MODNAME,
+                .owner = THIS_MODULE,
+                .acpi_match_table = ACPI_PTR(soc_button_acpi_match),
+        },
 };
-
-static int __init soc_button_init(void)
-{
-        return pnp_register_driver(&soc_button_pnp_driver);
-}
-
-static void __exit soc_button_exit(void)
-{
-        pnp_unregister_driver(&soc_button_pnp_driver);
-}
-
-module_init(soc_button_init);
-module_exit(soc_button_exit);
+module_platform_driver(soc_button_driver);
 
 MODULE_LICENSE("GPL");