Skip to content

Commit

Permalink
Input: wm831x-ts - convert to devm_input_allocate_device()
Browse files Browse the repository at this point in the history
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
  • Loading branch information
Mark Brown authored and Dmitry Torokhov committed Dec 24, 2012
1 parent 7488b1b commit e7cd0ae
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions drivers/input/touchscreen/wm831x-ts.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -376,7 +376,6 @@ static int wm831x_ts_probe(struct platform_device *pdev)
err_data_irq:
free_irq(wm831x_ts->data_irq, wm831x_ts);
err_alloc:
input_free_device(input_dev);

return error;
}
Expand All @@ -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;
}
Expand Down

0 comments on commit e7cd0ae

Please sign in to comment.