All of lore.kernel.org
 help / color / mirror / Atom feed
From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
To: Martin Kepplinger <martink@posteo.de>
Cc: Dixit Parmar <dixitparmar19@gmail.com>,
	Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>,
	Matthias Fend <matthias.fend@wolfvision.net>,
	linux-input@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 3/8] Input: st1232 - rely on I2C core to configure wakeup interrupt
Date: Tue, 22 Oct 2019 12:56:17 -0700	[thread overview]
Message-ID: <20191022195622.66976-4-dmitry.torokhov@gmail.com> (raw)
In-Reply-To: <20191022195622.66976-1-dmitry.torokhov@gmail.com>

When I2C client is created with I2C_CLIENT_WAKE flag (which happens
either because we have "wakeup-source" device property or the flag
was passed in when creating an I2C client manually), I2C core will
take care of configuring interrupt as wakeup source on suspend.

Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
---

 drivers/input/touchscreen/st1232.c | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/drivers/input/touchscreen/st1232.c b/drivers/input/touchscreen/st1232.c
index f1b97075aa9b..bb116f41f1c0 100644
--- a/drivers/input/touchscreen/st1232.c
+++ b/drivers/input/touchscreen/st1232.c
@@ -284,12 +284,10 @@ static int __maybe_unused st1232_ts_suspend(struct device *dev)
 	struct i2c_client *client = to_i2c_client(dev);
 	struct st1232_ts_data *ts = i2c_get_clientdata(client);
 
-	if (device_may_wakeup(&client->dev)) {
-		enable_irq_wake(client->irq);
-	} else {
-		disable_irq(client->irq);
+	disable_irq(client->irq);
+
+	if (!device_may_wakeup(&client->dev))
 		st1232_ts_power(ts, false);
-	}
 
 	return 0;
 }
@@ -299,12 +297,10 @@ static int __maybe_unused st1232_ts_resume(struct device *dev)
 	struct i2c_client *client = to_i2c_client(dev);
 	struct st1232_ts_data *ts = i2c_get_clientdata(client);
 
-	if (device_may_wakeup(&client->dev)) {
-		disable_irq_wake(client->irq);
-	} else {
+	if (!device_may_wakeup(&client->dev))
 		st1232_ts_power(ts, true);
-		enable_irq(client->irq);
-	}
+
+	enable_irq(client->irq);
 
 	return 0;
 }
-- 
2.23.0.866.gb869b98d4c-goog


  parent reply	other threads:[~2019-10-22 19:57 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-10-22 19:56 [PATCH 0/8] Face lift for st1232 touchscreen driver Dmitry Torokhov
2019-10-22 19:56 ` [PATCH 1/8] Input: st1232 - simplify parsing of read buffer Dmitry Torokhov
2019-10-22 19:56 ` [PATCH 2/8] Input: st1232 - do not unconditionally configure as wakeup source Dmitry Torokhov
2019-10-22 19:56 ` Dmitry Torokhov [this message]
2019-10-22 19:56 ` [PATCH 4/8] Input: st1232 - do not reset the chip too early Dmitry Torokhov
2019-10-22 19:56 ` [PATCH 5/8] Input: st1232 - do not allocate fingers data separately Dmitry Torokhov
2019-10-22 19:56 ` [PATCH 6/8] Input: st1232 - do not set parent device explicitly Dmitry Torokhov
2019-10-22 19:56 ` [PATCH 7/8] Input: st1232 - note that the receive buffer is DMA-safe Dmitry Torokhov
2019-10-22 19:56 ` [PATCH 8/8] Input: st1232 - switch to using MT-B protocol Dmitry Torokhov
2019-10-28  7:28 ` AW: [PATCH 0/8] Face lift for st1232 touchscreen driver Matthias Fend
2019-10-29  4:09   ` Dmitry Torokhov

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20191022195622.66976-4-dmitry.torokhov@gmail.com \
    --to=dmitry.torokhov@gmail.com \
    --cc=dixitparmar19@gmail.com \
    --cc=kuninori.morimoto.gx@renesas.com \
    --cc=linux-input@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=martink@posteo.de \
    --cc=matthias.fend@wolfvision.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.