Input: intel-mid-touch - switch to using managed resources

Let's switch the driver to use managed resources, this will simplify
error handling and driver unbinding logic.

Signed-off-by: Himangi Saraogi <himangi774@gmail.com>
Acked-by: Julia Lawall <julia.lawall@lip6.fr>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

diff --git a/drivers/input/touchscreen/intel-mid-touch.c b/drivers/input/touchscreen/intel-mid-touch.c
index 4f6b156144e9d7ac01e21921eb658edcf49e2ace..c38ca4a7e38694ddff666d5307c816e0afde6244 100644 (file)
--- a/drivers/input/touchscreen/intel-mid-touch.c
+++ b/drivers/input/touchscreen/intel-mid-touch.c
@@ -36,6 +36,7 @@
 #include <linux/irq.h>
 #include <linux/delay.h>
 #include <asm/intel_scu_ipc.h>
+#include <linux/device.h>
 
 /* PMIC Interrupt registers */
 #define PMIC_REG_ID1           0x00 /* PMIC ID1 register */
@@ -580,12 +581,17 @@ static int mrstouch_probe(struct platform_device *pdev)
                return -EINVAL;
        }
 
-       tsdev = kzalloc(sizeof(struct mrstouch_dev), GFP_KERNEL);
-       input = input_allocate_device();
-       if (!tsdev || !input) {
+       tsdev = devm_kzalloc(&pdev->dev, sizeof(struct mrstouch_dev),
+                            GFP_KERNEL);
+       if (!tsdev) {
                dev_err(&pdev->dev, "unable to allocate memory\n");
-               err = -ENOMEM;
-               goto err_free_mem;
+               return -ENOMEM;
+       }
+
+       input = devm_input_allocate_device(&pdev->dev);
+       if (!input) {
+               dev_err(&pdev->dev, "unable to allocate input device\n");
+               return -ENOMEM;
        }
 
        tsdev->dev = &pdev->dev;
@@ -598,7 +604,7 @@ static int mrstouch_probe(struct platform_device *pdev)
        err = mrstouch_adc_init(tsdev);
        if (err) {
                dev_err(&pdev->dev, "ADC initialization failed\n");
-               goto err_free_mem;
+               return err;
        }
 
        input->name = "mrst_touchscreen";
@@ -618,38 +624,20 @@ static int mrstouch_probe(struct platform_device *pdev)
        input_set_abs_params(tsdev->input, ABS_PRESSURE,
                             MRST_PRESSURE_MIN, MRST_PRESSURE_MAX, 0, 0);
 
-       err = request_threaded_irq(tsdev->irq, NULL, mrstouch_pendet_irq,
-                                  IRQF_ONESHOT, "mrstouch", tsdev);
+       err = devm_request_threaded_irq(&pdev->dev, tsdev->irq, NULL,
+                                       mrstouch_pendet_irq, IRQF_ONESHOT,
+                                       "mrstouch", tsdev);
        if (err) {
                dev_err(tsdev->dev, "unable to allocate irq\n");
-               goto err_free_mem;
+               return err;
        }
 
        err = input_register_device(tsdev->input);
        if (err) {
                dev_err(tsdev->dev, "unable to register input device\n");
-               goto err_free_irq;
+               return err;
        }
 
-       platform_set_drvdata(pdev, tsdev);
-       return 0;
-
-err_free_irq:
-       free_irq(tsdev->irq, tsdev);
-err_free_mem:
-       input_free_device(input);
-       kfree(tsdev);
-       return err;
-}
-
-static int mrstouch_remove(struct platform_device *pdev)
-{
-       struct mrstouch_dev *tsdev = platform_get_drvdata(pdev);
-
-       free_irq(tsdev->irq, tsdev);
-       input_unregister_device(tsdev->input);
-       kfree(tsdev);
-
        return 0;
 }
 
@@ -659,7 +647,6 @@ static struct platform_driver mrstouch_driver = {
                .owner  = THIS_MODULE,
        },
        .probe          = mrstouch_probe,
-       .remove         = mrstouch_remove,
 };
 module_platform_driver(mrstouch_driver);