Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e7cd0aeb authored by Mark Brown's avatar Mark Brown Committed by Dmitry Torokhov
Browse files

Input: wm831x-ts - convert to devm_input_allocate_device() 



Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent 7488b1b9

drivers/input/touchscreen/wm831x-ts.c

+1 −3
Original line number Diff line number Diff line
@@ -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 @@ 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;

}
@@ -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;

}