[PATCH 2/3] input: stmpe-ts: Use devm_*() routines

[Viresh Kumar]

This patch frees stmpe-ts driver from tension of freeing resources :)
devm_* derivatives of multiple routines are used while allocating resources,
which would be freed automatically by kernel.

Signed-off-by: Viresh Kumar <viresh.ku...@linaro.org>
---
 drivers/input/touchscreen/stmpe-ts.c | 45 +++++++++---------------------------
 1 file changed, 11 insertions(+), 34 deletions(-)

diff --git a/drivers/input/touchscreen/stmpe-ts.c 
b/drivers/input/touchscreen/stmpe-ts.c
index 692b685..66b932e 100644
--- a/drivers/input/touchscreen/stmpe-ts.c
+++ b/drivers/input/touchscreen/stmpe-ts.c
@@ -275,17 +275,13 @@ static int __devinit stmpe_input_probe(struct 
platform_device *pdev)
        if (ts_irq < 0)
                return ts_irq;
 
-       ts = kzalloc(sizeof(*ts), GFP_KERNEL);
-       if (!ts) {
-               ret = -ENOMEM;
-               goto err_out;
-       }
+       ts = devm_kzalloc(&pdev->dev, sizeof(*ts), GFP_KERNEL);
+       if (!ts)
+               return -ENOMEM;
 
-       idev = input_allocate_device();
-       if (!idev) {
-               ret = -ENOMEM;
-               goto err_free_ts;
-       }
+       idev = devm_input_allocate_device(&pdev->dev);
+       if (!idev)
+               return -ENOMEM;
 
        platform_set_drvdata(pdev, ts);
        ts->stmpe = stmpe;
@@ -309,16 +305,16 @@ static int __devinit stmpe_input_probe(struct 
platform_device *pdev)
 
        INIT_DELAYED_WORK(&ts->work, stmpe_work);
 
-       ret = request_threaded_irq(ts_irq, NULL, stmpe_ts_handler,
-                       IRQF_ONESHOT, STMPE_TS_NAME, ts);
+       ret = devm_request_threaded_irq(&pdev->dev, ts_irq, NULL,
+                       stmpe_ts_handler, IRQF_ONESHOT, STMPE_TS_NAME, ts);
        if (ret) {
                dev_err(&pdev->dev, "Failed to request IRQ %d\n", ts_irq);
-               goto err_free_input;
+               return ret;
        }
 
        ret = stmpe_init_hw(ts);
        if (ret)
-               goto err_free_irq;
+               return ret;
 
        idev->name = STMPE_TS_NAME;
        idev->id.bustype = BUS_I2C;
@@ -335,39 +331,20 @@ static int __devinit stmpe_input_probe(struct 
platform_device *pdev)
        input_set_abs_params(idev, ABS_PRESSURE, 0x0, 0xff, 0, 0);
 
        ret = input_register_device(idev);
-       if (ret) {
+       if (ret)
                dev_err(&pdev->dev, "Could not register input device\n");
-               goto err_free_irq;
-       }
-
-       return ret;
 
-err_free_irq:
-       free_irq(ts_irq, ts);
-err_free_input:
-       input_free_device(idev);
-       platform_set_drvdata(pdev, NULL);
-err_free_ts:
-       kfree(ts);
-err_out:
        return ret;
 }
 
 static int __devexit stmpe_ts_remove(struct platform_device *pdev)
 {
        struct stmpe_touch *ts = platform_get_drvdata(pdev);
-       unsigned int ts_irq = platform_get_irq_byname(pdev, "FIFO_TH");
 
        stmpe_disable(ts->stmpe, STMPE_BLOCK_TOUCHSCREEN);
 
-       free_irq(ts_irq, ts);
-
-       platform_set_drvdata(pdev, NULL);
-
        input_unregister_device(ts->idev);
 
-       kfree(ts);
-
        return 0;
 }
 
-- 
1.7.12.rc2.18.g61b472e

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/