Input: tps6507x-ts - update to devm_* API

Update the code to use devm_* API so that driver core will manage
resources.

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

diff --git a/drivers/input/touchscreen/tps6507x-ts.c b/drivers/input/touchscreen/tps6507x-ts.c
index a340bfc..75170a7 100644 (file)
--- a/drivers/input/touchscreen/tps6507x-ts.c
+++ b/drivers/input/touchscreen/tps6507x-ts.c
@@ -226,7 +226,7 @@ static int tps6507x_ts_probe(struct platform_device *pdev)
         */
        init_data = tps_board->tps6507x_ts_init_data;
 
-       tsc = kzalloc(sizeof(struct tps6507x_ts), GFP_KERNEL);
+       tsc = devm_kzalloc(&pdev->dev, sizeof(struct tps6507x_ts), GFP_KERNEL);
        if (!tsc) {
                dev_err(tps6507x_dev->dev, "failed to allocate driver data\n");
                return -ENOMEM;
@@ -240,11 +240,10 @@ static int tps6507x_ts_probe(struct platform_device *pdev)
        snprintf(tsc->phys, sizeof(tsc->phys),
                 "%s/input0", dev_name(tsc->dev));
 
-       poll_dev = input_allocate_polled_device();
+       poll_dev = devm_input_allocate_polled_device(&pdev->dev);
        if (!poll_dev) {
                dev_err(tsc->dev, "Failed to allocate polled input device.\n");
-               error = -ENOMEM;
-               goto err_free_mem;
+               return -ENOMEM;
        }
 
        tsc->poll_dev = poll_dev;
@@ -274,32 +273,11 @@ static int tps6507x_ts_probe(struct platform_device *pdev)
 
        error = tps6507x_adc_standby(tsc);
        if (error)
-               goto err_free_polled_dev;
+               return error;
 
        error = input_register_polled_device(poll_dev);
        if (error)
-               goto err_free_polled_dev;
-
-       platform_set_drvdata(pdev, tsc);
-
-       return 0;
-
-err_free_polled_dev:
-       input_free_polled_device(poll_dev);
-err_free_mem:
-       kfree(tsc);
-       return error;
-}
-
-static int tps6507x_ts_remove(struct platform_device *pdev)
-{
-       struct tps6507x_ts *tsc = platform_get_drvdata(pdev);
-       struct input_polled_dev *poll_dev = tsc->poll_dev;
-
-       input_unregister_polled_device(poll_dev);
-       input_free_polled_device(poll_dev);
-
-       kfree(tsc);
+               return error;
 
        return 0;
 }
@@ -309,7 +287,6 @@ static struct platform_driver tps6507x_ts_driver = {
                .name = "tps6507x-ts",
        },
        .probe = tps6507x_ts_probe,
-       .remove = tps6507x_ts_remove,
 };
 module_platform_driver(tps6507x_ts_driver);