diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-24 09:45:22 -0800 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-12-24 09:52:29 -0800 |
| commit | 5d3caa442e0858fa07b9a6a68d05e1ba2cf246a4 (patch) | |
| tree | 19e2bd5344ce67fc349f7b6b4882403361785448 /drivers/input/misc/wm831x-on.c | |
| parent | e7cd0aeb323441228ebbffb0c5a78ea1132663fd (diff) | |
| download | blackbird-op-linux-5d3caa442e0858fa07b9a6a68d05e1ba2cf246a4.tar.gz blackbird-op-linux-5d3caa442e0858fa07b9a6a68d05e1ba2cf246a4.zip | |
Input: wm831x-on - convert to devm_input_allocate_device()
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input/misc/wm831x-on.c')
| -rw-r--r-- | drivers/input/misc/wm831x-on.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/input/misc/wm831x-on.c b/drivers/input/misc/wm831x-on.c index 558767d8ebf4..caa2c4068f09 100644 --- a/drivers/input/misc/wm831x-on.c +++ b/drivers/input/misc/wm831x-on.c @@ -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; @@ -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; } @@ -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; } |
