leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Input: wm831x-ts - convert to devm_input_allocate_device()

Browse Source 
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
This commit is contained in:
Mark Brown 2012-12-24 09:44:43 -08:00 committed by Dmitry Torokhov
parent 7488b1b94b
commit e7cd0aeb32
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/input/touchscreen/wm831x-ts.c
View File

@ -247,7 +247,7 @@ static int wm831x_ts_probe(struct platform_device *pdev)
wm831x_ts = devm_kzalloc(&pdev->dev, sizeof(struct wm831x_ts), wm831x_ts = devm_kzalloc(&pdev->dev, sizeof(struct wm831x_ts),
GFP_KERNEL); GFP_KERNEL);
input_dev = input_allocate_device(); input_dev = devm_input_allocate_device(&pdev->dev);
if (!wm831x_ts || !input_dev) { if (!wm831x_ts || !input_dev) {
error = -ENOMEM; error = -ENOMEM;
goto err_alloc; goto err_alloc;
@ -376,7 +376,6 @@ err_pd_irq:
err_data_irq: err_data_irq:
free_irq(wm831x_ts->data_irq, wm831x_ts); free_irq(wm831x_ts->data_irq, wm831x_ts);
err_alloc: err_alloc:
input_free_device(input_dev);
return error; 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->pd_irq, wm831x_ts);
free_irq(wm831x_ts->data_irq, wm831x_ts); free_irq(wm831x_ts->data_irq, wm831x_ts);
input_unregister_device(wm831x_ts->input_dev);
return 0; return 0;
} }