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

Pull input updates from Dmitry Torokhov:
 "A big update to the Atmel touchscreen driver, devm support for polled
  input devices, several drivers have been converted to using managed
  resources, and assorted driver fixes"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (87 commits)
  Input: synaptics - fix resolution for manually provided min/max
  Input: atmel_mxt_ts - fix invalid return from mxt_get_bootloader_version
  Input: max8997_haptic - add error handling for regulator and pwm
  Input: elantech - don't set bit 1 of reg_10 when the no_hw_res quirk is set
  Input: elantech - deal with clickpads reporting right button events
  Input: edt-ft5x06 - fix an i2c write for M09 support
  Input: omap-keypad - remove platform data support
  ARM: OMAP2+: remove unused omap4-keypad file and code
  Input: ab8500-ponkey - switch to using managed resources
  Input: max8925_onkey - switch to using managed resources
  Input: 88pm860x-ts - switch to using managed resources
  Input: 88pm860x_onkey - switch to using managed resources
  Input: intel-mid-touch - switch to using managed resources
  Input: wacom - process outbound for newer Cintiqs
  Input: wacom - set stylus_in_proximity when pen is in range
  DTS: ARM: OMAP3-N900: Add tsc2005 support
  Input: tsc2005 - add DT support
  Input: add common DT binding for touchscreens
  Input: jornada680_kbd - switch top using managed resources
  Input: adp5520-keys - switch to using managed resources
  ...

1 files changed, 18 insertions, 37 deletions

diff --git a/drivers/input/misc/max8925_onkey.c b/drivers/input/misc/max8925_onkey.c
index eef41cfc054d..3809618e6a5d 100644
--- a/drivers/input/misc/max8925_onkey.c
+++ b/drivers/input/misc/max8925_onkey.c
@@ -26,6 +26,7 @@
 #include <linux/interrupt.h>
 #include <linux/mfd/max8925.h>
 #include <linux/slab.h>
+#include <linux/device.h>
 
 #define SW_INPUT                (1 << 7)        /* 0/1 -- up/down */
 #define HARDRESET_EN            (1 << 7)
@@ -81,12 +82,14 @@ static int max8925_onkey_probe(struct platform_device *pdev)
                 return -EINVAL;
         }
 
-        info = kzalloc(sizeof(struct max8925_onkey_info), GFP_KERNEL);
-        input = input_allocate_device();
-        if (!info || !input) {
-                error = -ENOMEM;
-                goto err_free_mem;
-        }
+        info = devm_kzalloc(&pdev->dev, sizeof(struct max8925_onkey_info),
+                            GFP_KERNEL);
+        if (!info)
+                return -ENOMEM;
+
+        input = devm_input_allocate_device(&pdev->dev);
+        if (!input)
+                return -ENOMEM;
 
         info->idev = input;
         info->i2c = chip->i2c;
@@ -100,55 +103,34 @@ static int max8925_onkey_probe(struct platform_device *pdev)
         input->dev.parent = &pdev->dev;
         input_set_capability(input, EV_KEY, KEY_POWER);
 
-        error = request_threaded_irq(irq[0], NULL, max8925_onkey_handler,
-                                     IRQF_ONESHOT, "onkey-down", info);
+        error = devm_request_threaded_irq(&pdev->dev, irq[0], NULL,
+                                          max8925_onkey_handler, IRQF_ONESHOT,
+                                          "onkey-down", info);
         if (error < 0) {
                 dev_err(chip->dev, "Failed to request IRQ: #%d: %d\n",
                         irq[0], error);
-                goto err_free_mem;
+                return error;
         }
 
-        error = request_threaded_irq(irq[1], NULL, max8925_onkey_handler,
-                                     IRQF_ONESHOT, "onkey-up", info);
+        error = devm_request_threaded_irq(&pdev->dev, irq[1], NULL,
+                                          max8925_onkey_handler, IRQF_ONESHOT,
+                                          "onkey-up", info);
         if (error < 0) {
                 dev_err(chip->dev, "Failed to request IRQ: #%d: %d\n",
                         irq[1], error);
-                goto err_free_irq0;
+                return error;
         }
 
         error = input_register_device(info->idev);
         if (error) {
                 dev_err(chip->dev, "Can't register input device: %d\n", error);
-                goto err_free_irq1;
+                return error;
         }
 
         platform_set_drvdata(pdev, info);
         device_init_wakeup(&pdev->dev, 1);
 
         return 0;
-
-err_free_irq1:
-        free_irq(irq[1], info);
-err_free_irq0:
-        free_irq(irq[0], info);
-err_free_mem:
-        input_free_device(input);
-        kfree(info);
-
-        return error;
-}
-
-static int max8925_onkey_remove(struct platform_device *pdev)
-{
-        struct max8925_onkey_info *info = platform_get_drvdata(pdev);
-        struct max8925_chip *chip = dev_get_drvdata(pdev->dev.parent);
-
-        free_irq(info->irq[0] + chip->irq_base, info);
-        free_irq(info->irq[1] + chip->irq_base, info);
-        input_unregister_device(info->idev);
-        kfree(info);
-
-        return 0;
 }
 
 #ifdef CONFIG_PM_SLEEP
@@ -190,7 +172,6 @@ static struct platform_driver max8925_onkey_driver = {
                 .pm     = &max8925_onkey_pm_ops,
         },
         .probe          = max8925_onkey_probe,
-        .remove         = max8925_onkey_remove,
 };
 module_platform_driver(max8925_onkey_driver);