Merge tag 'virtio-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[firefly-linux-kernel-4.4.55.git] / drivers / input / misc / 88pm860x_onkey.c

diff --git a/drivers/input/misc/88pm860x_onkey.c b/drivers/input/misc/88pm860x_onkey.c
index abd8453e521209cd52295b498cd0a0e20e9280d4..220ce0fa15d971d23cbcaa806cc36dc728249cab 100644 (file)
--- a/drivers/input/misc/88pm860x_onkey.c
+++ b/drivers/input/misc/88pm860x_onkey.c
@@ -26,6 +26,7 @@
 #include <linux/interrupt.h>
 #include <linux/mfd/88pm860x.h>
 #include <linux/slab.h>
+#include <linux/device.h>
 
 #define PM8607_WAKEUP          0x0b
 
@@ -68,7 +69,8 @@ static int pm860x_onkey_probe(struct platform_device *pdev)
                return -EINVAL;
        }
 
-       info = kzalloc(sizeof(struct pm860x_onkey_info), GFP_KERNEL);
+       info = devm_kzalloc(&pdev->dev, sizeof(struct pm860x_onkey_info),
+                           GFP_KERNEL);
        if (!info)
                return -ENOMEM;
        info->chip = chip;
@@ -76,11 +78,10 @@ static int pm860x_onkey_probe(struct platform_device *pdev)
        info->dev = &pdev->dev;
        info->irq = irq;
 
-       info->idev = input_allocate_device();
+       info->idev = devm_input_allocate_device(&pdev->dev);
        if (!info->idev) {
                dev_err(chip->dev, "Failed to allocate input dev\n");
-               ret = -ENOMEM;
-               goto out;
+               return -ENOMEM;
        }
 
        info->idev->name = "88pm860x_on";
@@ -93,42 +94,22 @@ static int pm860x_onkey_probe(struct platform_device *pdev)
        ret = input_register_device(info->idev);
        if (ret) {
                dev_err(chip->dev, "Can't register input device: %d\n", ret);
-               goto out_reg;
+               return ret;
        }
 
-       ret = request_threaded_irq(info->irq, NULL, pm860x_onkey_handler,
-                                  IRQF_ONESHOT, "onkey", info);
+       ret = devm_request_threaded_irq(&pdev->dev, info->irq, NULL,
+                                       pm860x_onkey_handler, IRQF_ONESHOT,
+                                       "onkey", info);
        if (ret < 0) {
                dev_err(chip->dev, "Failed to request IRQ: #%d: %d\n",
                        info->irq, ret);
-               goto out_irq;
+               return ret;
        }
 
        platform_set_drvdata(pdev, info);
        device_init_wakeup(&pdev->dev, 1);
 
        return 0;
-
-out_irq:
-       input_unregister_device(info->idev);
-       kfree(info);
-       return ret;
-
-out_reg:
-       input_free_device(info->idev);
-out:
-       kfree(info);
-       return ret;
-}
-
-static int pm860x_onkey_remove(struct platform_device *pdev)
-{
-       struct pm860x_onkey_info *info = platform_get_drvdata(pdev);
-
-       free_irq(info->irq, info);
-       input_unregister_device(info->idev);
-       kfree(info);
-       return 0;
 }
 
 #ifdef CONFIG_PM_SLEEP
@@ -161,7 +142,6 @@ static struct platform_driver pm860x_onkey_driver = {
                .pm     = &pm860x_onkey_pm_ops,
        },
        .probe          = pm860x_onkey_probe,
-       .remove         = pm860x_onkey_remove,
 };
 module_platform_driver(pm860x_onkey_driver);