Skip to content

Commit

Permalink
Input: wm831x-on - 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 e7cd0ae commit 5d3caa4
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions drivers/input/misc/wm831x-on.c
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ static int wm831x_on_probe(struct platform_device *pdev)
wm831x_on->wm831x = wm831x;
INIT_DELAYED_WORK(&wm831x_on->work, wm831x_poll_on);

wm831x_on->dev = input_allocate_device();
wm831x_on->dev = devm_input_allocate_device(&pdev->dev);
if (!wm831x_on->dev) {
dev_err(&pdev->dev, "Can't allocate input dev\n");
ret = -ENOMEM;
Expand Down Expand Up @@ -119,7 +119,6 @@ static int wm831x_on_probe(struct platform_device *pdev)
err_irq:
free_irq(irq, wm831x_on);
err_input_dev:
input_free_device(wm831x_on->dev);
err:
return ret;
}
Expand All @@ -131,7 +130,6 @@ static int wm831x_on_remove(struct platform_device *pdev)

free_irq(irq, wm831x_on);
cancel_delayed_work_sync(&wm831x_on->work);
input_unregister_device(wm831x_on->dev);

return 0;
}
Expand Down

0 comments on commit 5d3caa4

Please sign in to comment.