linux-input.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
To: Michael Hennerich <michael.hennerich@analog.com>
Cc: "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>,
	linux-input@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 4/4] Input: adp5588-keys - do not explicitly set device as wakeup source
Date: Fri, 27 May 2022 21:56:31 -0700	[thread overview]
Message-ID: <20220528045631.289821-4-dmitry.torokhov@gmail.com> (raw)
In-Reply-To: <20220528045631.289821-1-dmitry.torokhov@gmail.com>

I2C core will set up device as a wakeup source and will configure interrupt
as a wakeup interrupt if client is created with I2C_CLIENT_WAKE flag. Let's
rely on this facility and to not unconditionally set up the device as
wakeup device in the driver.

Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
---
 drivers/input/keyboard/adp5588-keys.c | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/drivers/input/keyboard/adp5588-keys.c b/drivers/input/keyboard/adp5588-keys.c
index df84a2998ed2..2a274240facb 100644
--- a/drivers/input/keyboard/adp5588-keys.c
+++ b/drivers/input/keyboard/adp5588-keys.c
@@ -589,8 +589,6 @@ static int adp5588_probe(struct i2c_client *client,
 	if (error)
 		return error;
 
-	device_init_wakeup(&client->dev, 1);
-
 	dev_info(&client->dev, "Rev.%d keypad, irq %d\n", revid, client->irq);
 	return 0;
 }
@@ -609,9 +607,6 @@ static int __maybe_unused adp5588_suspend(struct device *dev)
 
 	disable_irq(client->irq);
 
-	if (device_may_wakeup(&client->dev))
-		enable_irq_wake(client->irq);
-
 	return 0;
 }
 
@@ -619,9 +614,6 @@ static int __maybe_unused adp5588_resume(struct device *dev)
 {
 	struct i2c_client *client = to_i2c_client(dev);
 
-	if (device_may_wakeup(&client->dev))
-		disable_irq_wake(client->irq);
-
 	enable_irq(client->irq);
 
 	return 0;
-- 
2.36.1.124.g0e6072fb45-goog


  parent reply	other threads:[~2022-05-28  4:56 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-05-28  4:56 [PATCH 1/4] Input: adp5588-keys - drop CONFIG_PM guards Dmitry Torokhov
2022-05-28  4:56 ` [PATCH 2/4] Input: adp5588-keys - switch to using threaded interrupt Dmitry Torokhov
2022-05-30 10:10   ` Hennerich, Michael
2022-05-28  4:56 ` [PATCH 3/4] Input: adp5588-keys - switch to using managed resources Dmitry Torokhov
2022-05-28 19:37   ` Uwe Kleine-König
2022-05-29  5:22     ` Dmitry Torokhov
2022-05-29  6:11       ` Uwe Kleine-König
2022-05-30 10:11   ` Hennerich, Michael
2022-05-28  4:56 ` Dmitry Torokhov [this message]
2022-05-30 10:11   ` [PATCH 4/4] Input: adp5588-keys - do not explicitly set device as wakeup source Hennerich, Michael
2022-05-30 10:06 ` [PATCH 1/4] Input: adp5588-keys - drop CONFIG_PM guards Hennerich, Michael

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=20220528045631.289821-4-dmitry.torokhov@gmail.com \
    --to=dmitry.torokhov@gmail.com \
    --cc=linux-input@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=michael.hennerich@analog.com \
    --cc=u.kleine-koenig@pengutronix.de \
    /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 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).