public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: "Rob Herring" <robh@kernel.org>,
	"Grant Likely" <grant.likely@linaro.org>,
	"Linus Walleij" <linus.walleij@linaro.org>,
	"Thierry Reding" <treding@nvidia.com>,
	"Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>,
	linux-kernel@vger.kernel.org,
	"Rafael J. Wysocki" <rafael@kernel.org>
Subject: [PATCH] driver-core: platform: automatically mark wakeup devices
Date: Sun, 17 Jan 2016 18:11:38 -0800	[thread overview]
Message-ID: <20160118021138.GA20498@dtor-ws> (raw)

When probing platform drivers let's check if corresponding devices have
"wakeup-source" property defined (either in device tree, ACPI, or static
platform properties) and automatically enable such devices as wakeup
sources for the system. This will help us standardize on the name for this
property and reduce amount of boilerplate code in the drivers.

Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
---
 drivers/base/platform.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/drivers/base/platform.c b/drivers/base/platform.c
index 1dd6d3b..d14071a 100644
--- a/drivers/base/platform.c
+++ b/drivers/base/platform.c
@@ -514,9 +514,14 @@ static int platform_drv_probe(struct device *_dev)
 
 	ret = dev_pm_domain_attach(_dev, true);
 	if (ret != -EPROBE_DEFER && drv->probe) {
+		bool wakeup = device_property_read_bool(_dev, "wakeup-source");
+
+		device_init_wakeup(_dev, wakeup);
 		ret = drv->probe(dev);
-		if (ret)
+		if (ret) {
+			device_init_wakeup(_dev, false);
 			dev_pm_domain_detach(_dev, true);
+		}
 	}
 
 	if (drv->prevent_deferred_probe && ret == -EPROBE_DEFER) {
@@ -540,6 +545,8 @@ static int platform_drv_remove(struct device *_dev)
 
 	if (drv->remove)
 		ret = drv->remove(dev);
+
+	device_init_wakeup(_dev, false);
 	dev_pm_domain_detach(_dev, true);
 
 	return ret;
-- 
2.6.0.rc2.230.g3dd15c0


-- 
Dmitry

             reply	other threads:[~2016-01-18  2:11 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-01-18  2:11 Dmitry Torokhov [this message]
2016-01-18  5:11 ` [PATCH] driver-core: platform: automatically mark wakeup devices Greg Kroah-Hartman
2016-01-18  6:14   ` Dmitry Torokhov
2016-01-18 15:35     ` Sudeep Holla
2016-01-18 14:47 ` Rafael J. Wysocki
2016-01-18 15:23   ` Sudeep Holla
2016-01-18 15:41     ` Rafael J. Wysocki
2016-01-18 15:58       ` Sudeep Holla
2016-01-18 17:09         ` Rafael J. Wysocki
2016-01-18 16:22   ` Dmitry Torokhov
2016-01-18 17:19     ` Rafael J. Wysocki
2016-01-18 17:55       ` Dmitry Torokhov
2016-01-18 22:18         ` Rafael J. Wysocki
2016-01-20  0:45           ` Dmitry Torokhov
2016-01-20  2:40             ` Rafael J. Wysocki
2016-01-20 13:51               ` Rafael J. Wysocki
2016-01-20 23:01                 ` Rafael J. Wysocki
2016-01-21  0:23                   ` Dmitry Torokhov
2016-01-26 16:47                     ` Rafael J. Wysocki

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=20160118021138.GA20498@dtor-ws \
    --to=dmitry.torokhov@gmail.com \
    --cc=grant.likely@linaro.org \
    --cc=gregkh@linuxfoundation.org \
    --cc=linus.walleij@linaro.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=rafael@kernel.org \
    --cc=robh@kernel.org \
    --cc=treding@nvidia.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