| From 9f9344aee5ea067658de721eac5be380e4e1e527 Mon Sep 17 00:00:00 2001 |
| From: Guenter Roeck <linux@roeck-us.net> |
| Date: Sat, 21 Jan 2017 23:49:13 -0800 |
| Subject: [PATCH 179/255] 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: Guenter Roeck <linux@roeck-us.net> |
| Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> |
| (cherry picked from commit 8e1b4d83cf8b0e62f5a45792d07f027783c1a07c) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| drivers/input/touchscreen/ads7846.c | 2 -- |
| drivers/input/touchscreen/bu21013_ts.c | 2 -- |
| drivers/input/touchscreen/eeti_ts.c | 1 - |
| drivers/input/touchscreen/lpc32xx_ts.c | 1 - |
| drivers/input/touchscreen/st1232.c | 1 - |
| 5 files changed, 7 deletions(-) |
| |
| --- a/drivers/input/touchscreen/ads7846.c |
| +++ b/drivers/input/touchscreen/ads7846.c |
| @@ -1462,8 +1462,6 @@ static int ads7846_remove(struct spi_dev |
| { |
| 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); |
| --- a/drivers/input/touchscreen/bu21013_ts.c |
| +++ b/drivers/input/touchscreen/bu21013_ts.c |
| @@ -637,8 +637,6 @@ static int bu21013_remove(struct i2c_cli |
| |
| kfree(bu21013_data); |
| |
| - device_init_wakeup(&client->dev, false); |
| - |
| return 0; |
| } |
| |
| --- a/drivers/input/touchscreen/eeti_ts.c |
| +++ b/drivers/input/touchscreen/eeti_ts.c |
| @@ -232,7 +232,6 @@ static int eeti_ts_probe(struct i2c_clie |
| */ |
| eeti_ts_stop(priv); |
| |
| - device_init_wakeup(&client->dev, 0); |
| return 0; |
| |
| err3: |
| --- a/drivers/input/touchscreen/lpc32xx_ts.c |
| +++ b/drivers/input/touchscreen/lpc32xx_ts.c |
| @@ -313,7 +313,6 @@ static int lpc32xx_ts_remove(struct plat |
| 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); |
| --- a/drivers/input/touchscreen/st1232.c |
| +++ b/drivers/input/touchscreen/st1232.c |
| @@ -237,7 +237,6 @@ static int st1232_ts_remove(struct i2c_c |
| { |
| struct st1232_ts_data *ts = i2c_get_clientdata(client); |
| |
| - device_init_wakeup(&client->dev, 0); |
| st1232_ts_power(ts, false); |
| |
| return 0; |