* [PATCH] Input: pixcir_i2c_ts: remove wakeirq related code from pixcir driver
@ 2015-10-14 5:53 Vignesh R
2015-10-14 6:33 ` Dmitry Torokhov
0 siblings, 1 reply; 2+ messages in thread
From: Vignesh R @ 2015-10-14 5:53 UTC (permalink / raw)
To: Dmitry Torokhov
Cc: Roger Quadros, Frodo Lai, Jingoo Han, Henrik Rydberg,
Krzysztof Kozlowski, Vignesh R, linux-input, linux-kernel
With commit 3fffd1283927 ("i2c: allow specifying separate wakeup
interrupt in device tree") wakeirq is managed by i2c-core, so remove
wakeirq related code from pixcir_i2c_ts driver.
Signed-off-by: Vignesh R <vigneshr@ti.com>
---
drivers/input/touchscreen/pixcir_i2c_ts.c | 12 ------------
1 file changed, 12 deletions(-)
diff --git a/drivers/input/touchscreen/pixcir_i2c_ts.c b/drivers/input/touchscreen/pixcir_i2c_ts.c
index 91621725bfb5..4b961ad9f0b5 100644
--- a/drivers/input/touchscreen/pixcir_i2c_ts.c
+++ b/drivers/input/touchscreen/pixcir_i2c_ts.c
@@ -377,8 +377,6 @@ static int __maybe_unused pixcir_i2c_ts_suspend(struct device *dev)
goto unlock;
}
}
-
- enable_irq_wake(client->irq);
} else if (input->users) {
ret = pixcir_stop(ts);
}
@@ -399,7 +397,6 @@ static int __maybe_unused pixcir_i2c_ts_resume(struct device *dev)
mutex_lock(&input->mutex);
if (device_may_wakeup(&client->dev)) {
- disable_irq_wake(client->irq);
if (!input->users) {
ret = pixcir_stop(ts);
@@ -564,14 +561,6 @@ static int pixcir_i2c_ts_probe(struct i2c_client *client,
return error;
i2c_set_clientdata(client, tsdata);
- device_init_wakeup(&client->dev, 1);
-
- return 0;
-}
-
-static int pixcir_i2c_ts_remove(struct i2c_client *client)
-{
- device_init_wakeup(&client->dev, 0);
return 0;
}
@@ -609,7 +598,6 @@ static struct i2c_driver pixcir_i2c_ts_driver = {
.of_match_table = of_match_ptr(pixcir_of_match),
},
.probe = pixcir_i2c_ts_probe,
- .remove = pixcir_i2c_ts_remove,
.id_table = pixcir_i2c_ts_id,
};
--
2.6.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] Input: pixcir_i2c_ts: remove wakeirq related code from pixcir driver
2015-10-14 5:53 [PATCH] Input: pixcir_i2c_ts: remove wakeirq related code from pixcir driver Vignesh R
@ 2015-10-14 6:33 ` Dmitry Torokhov
0 siblings, 0 replies; 2+ messages in thread
From: Dmitry Torokhov @ 2015-10-14 6:33 UTC (permalink / raw)
To: Vignesh R
Cc: Roger Quadros, Frodo Lai, Jingoo Han, Henrik Rydberg,
Krzysztof Kozlowski, linux-input, linux-kernel
On Wed, Oct 14, 2015 at 11:23:56AM +0530, Vignesh R wrote:
> With commit 3fffd1283927 ("i2c: allow specifying separate wakeup
> interrupt in device tree") wakeirq is managed by i2c-core, so remove
> wakeirq related code from pixcir_i2c_ts driver.
>
> Signed-off-by: Vignesh R <vigneshr@ti.com>
Applied, thank you.
> ---
> drivers/input/touchscreen/pixcir_i2c_ts.c | 12 ------------
> 1 file changed, 12 deletions(-)
>
> diff --git a/drivers/input/touchscreen/pixcir_i2c_ts.c b/drivers/input/touchscreen/pixcir_i2c_ts.c
> index 91621725bfb5..4b961ad9f0b5 100644
> --- a/drivers/input/touchscreen/pixcir_i2c_ts.c
> +++ b/drivers/input/touchscreen/pixcir_i2c_ts.c
> @@ -377,8 +377,6 @@ static int __maybe_unused pixcir_i2c_ts_suspend(struct device *dev)
> goto unlock;
> }
> }
> -
> - enable_irq_wake(client->irq);
> } else if (input->users) {
> ret = pixcir_stop(ts);
> }
> @@ -399,7 +397,6 @@ static int __maybe_unused pixcir_i2c_ts_resume(struct device *dev)
> mutex_lock(&input->mutex);
>
> if (device_may_wakeup(&client->dev)) {
> - disable_irq_wake(client->irq);
>
> if (!input->users) {
> ret = pixcir_stop(ts);
> @@ -564,14 +561,6 @@ static int pixcir_i2c_ts_probe(struct i2c_client *client,
> return error;
>
> i2c_set_clientdata(client, tsdata);
> - device_init_wakeup(&client->dev, 1);
> -
> - return 0;
> -}
> -
> -static int pixcir_i2c_ts_remove(struct i2c_client *client)
> -{
> - device_init_wakeup(&client->dev, 0);
>
> return 0;
> }
> @@ -609,7 +598,6 @@ static struct i2c_driver pixcir_i2c_ts_driver = {
> .of_match_table = of_match_ptr(pixcir_of_match),
> },
> .probe = pixcir_i2c_ts_probe,
> - .remove = pixcir_i2c_ts_remove,
> .id_table = pixcir_i2c_ts_id,
> };
>
> --
> 2.6.1
>
--
Dmitry
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-10-14 6:33 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-10-14 5:53 [PATCH] Input: pixcir_i2c_ts: remove wakeirq related code from pixcir driver Vignesh R
2015-10-14 6:33 ` Dmitry Torokhov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).