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

Commit 8e1b4d83 authored by Guenter Roeck's avatar Guenter Roeck Committed by Dmitry Torokhov
Browse files

Input: touchscreen - drop unnecessary calls to device_init_wakeup 



Calling device_init_wakeup in the remove function is unnecessary since the
device is going away, and thus won't be able to cause any wakeups under any
circumstances. Besides, the driver cleanup code already handles the
necessary cleanup.

Similarly, disabling wakeup in the probe error path is unnecessary, as is
disabling wakeup in the probe function in the first place.

Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent 56580c2c

drivers/input/touchscreen/ads7846.c

+0 −2
Original line number Diff line number Diff line
@@ -1462,8 +1462,6 @@ static int ads7846_remove(struct spi_device *spi) 
{

	struct ads7846 *ts = spi_get_drvdata(spi);



	device_init_wakeup(&spi->dev, false);



	sysfs_remove_group(&spi->dev.kobj, &ads784x_attr_group);



	ads7846_disable(ts);

drivers/input/touchscreen/bu21013_ts.c

+0 −2
Original line number Diff line number Diff line
@@ -637,8 +637,6 @@ static int bu21013_remove(struct i2c_client *client) 


	kfree(bu21013_data);



	device_init_wakeup(&client->dev, false);



	return 0;

}

drivers/input/touchscreen/eeti_ts.c

+0 −1
Original line number Diff line number Diff line
@@ -231,7 +231,6 @@ static int eeti_ts_probe(struct i2c_client *client, 
	 */

	eeti_ts_stop(priv);



	device_init_wakeup(&client->dev, 0);

	return 0;



err3:

drivers/input/touchscreen/lpc32xx_ts.c

+0 −1
Original line number Diff line number Diff line
@@ -313,7 +313,6 @@ static int lpc32xx_ts_remove(struct platform_device *pdev) 
	struct lpc32xx_tsc *tsc = platform_get_drvdata(pdev);

	struct resource *res;



	device_init_wakeup(&pdev->dev, 0);

	free_irq(tsc->irq, tsc);



	input_unregister_device(tsc->dev);

drivers/input/touchscreen/st1232.c

+0 −1
Original line number Diff line number Diff line
@@ -237,7 +237,6 @@ static int st1232_ts_remove(struct i2c_client *client) 
{

	struct st1232_ts_data *ts = i2c_get_clientdata(client);



	device_init_wakeup(&client->dev, 0);

	st1232_ts_power(ts, false);



	return 0;