Input: wm831x-ts - convert to devm_input_allocate_device()

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

diff --git a/drivers/input/touchscreen/wm831x-ts.c b/drivers/input/touchscreen/wm831x-ts.c
index f88fab56178cd5852b5844ea106335a613dc9014..6be2eb6a153a5588180da011fd91611d2ad597ad 100644 (file)
--- a/drivers/input/touchscreen/wm831x-ts.c
+++ b/drivers/input/touchscreen/wm831x-ts.c
@@ -247,7 +247,7 @@ static int wm831x_ts_probe(struct platform_device *pdev)
 
        wm831x_ts = devm_kzalloc(&pdev->dev, sizeof(struct wm831x_ts),
                                 GFP_KERNEL);
-       input_dev = input_allocate_device();
+       input_dev = devm_input_allocate_device(&pdev->dev);
        if (!wm831x_ts || !input_dev) {
                error = -ENOMEM;
                goto err_alloc;
@@ -376,7 +376,6 @@ err_pd_irq:
 err_data_irq:
        free_irq(wm831x_ts->data_irq, wm831x_ts);
 err_alloc:
-       input_free_device(input_dev);
 
        return error;
 }
@@ -387,7 +386,6 @@ static int wm831x_ts_remove(struct platform_device *pdev)
 
        free_irq(wm831x_ts->pd_irq, wm831x_ts);
        free_irq(wm831x_ts->data_irq, wm831x_ts);
-       input_unregister_device(wm831x_ts->input_dev);
 
        return 0;
 }