From: ulf.hansson@linaro.org (Ulf Hansson)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v4 1/9] ACPI / PM: Let acpi_dev_pm_detach() return an error code
Date: Tue, 9 Sep 2014 13:36:02 +0200 [thread overview]
Message-ID: <1410262570-22785-2-git-send-email-ulf.hansson@linaro.org> (raw)
In-Reply-To: <1410262570-22785-1-git-send-email-ulf.hansson@linaro.org>
To give callers the option of acting on a errors while removing the
pm_domain ops for the device in the ACPI PM domain, let
acpi_dev_pm_detach() return an int to provide the error code.
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Tested-by: Philipp Zabel <p.zabel@pengutronix.de>
Acked-by: Pavel Machek <Pavel@ucw.cz>
Reviewed-by: Kevin Hilman <khilman@linaro.org>
---
drivers/acpi/device_pm.c | 8 +++++++-
include/linux/acpi.h | 7 +++++--
2 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/drivers/acpi/device_pm.c b/drivers/acpi/device_pm.c
index 67075f8..0d52ce1 100644
--- a/drivers/acpi/device_pm.c
+++ b/drivers/acpi/device_pm.c
@@ -1055,6 +1055,8 @@ static struct dev_pm_domain acpi_general_pm_domain = {
*
* Callers must ensure proper synchronization of this function with power
* management callbacks.
+ *
+ * Returns 0 on successfully attached PM domain or negative error code.
*/
int acpi_dev_pm_attach(struct device *dev, bool power_on)
{
@@ -1087,8 +1089,10 @@ EXPORT_SYMBOL_GPL(acpi_dev_pm_attach);
*
* Callers must ensure proper synchronization of this function with power
* management callbacks.
+ *
+ * Returns 0 on successfully detached PM domain or negative error code.
*/
-void acpi_dev_pm_detach(struct device *dev, bool power_off)
+int acpi_dev_pm_detach(struct device *dev, bool power_off)
{
struct acpi_device *adev = ACPI_COMPANION(dev);
@@ -1107,7 +1111,9 @@ void acpi_dev_pm_detach(struct device *dev, bool power_off)
acpi_device_wakeup(adev, ACPI_STATE_S0, false);
acpi_dev_pm_low_power(dev, adev, ACPI_STATE_S0);
}
+ return 0;
}
+ return -EINVAL;
}
EXPORT_SYMBOL_GPL(acpi_dev_pm_detach);
#endif /* CONFIG_PM */
diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index 807cbc4..c83cca5 100644
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -587,7 +587,7 @@ static inline int acpi_subsys_freeze(struct device *dev) { return 0; }
#if defined(CONFIG_ACPI) && defined(CONFIG_PM)
struct acpi_device *acpi_dev_pm_get_node(struct device *dev);
int acpi_dev_pm_attach(struct device *dev, bool power_on);
-void acpi_dev_pm_detach(struct device *dev, bool power_off);
+int acpi_dev_pm_detach(struct device *dev, bool power_off);
#else
static inline struct acpi_device *acpi_dev_pm_get_node(struct device *dev)
{
@@ -597,7 +597,10 @@ static inline int acpi_dev_pm_attach(struct device *dev, bool power_on)
{
return -ENODEV;
}
-static inline void acpi_dev_pm_detach(struct device *dev, bool power_off) {}
+static inline int acpi_dev_pm_detach(struct device *dev, bool power_off)
+{
+ return -ENODEV;
+}
#endif
#ifdef CONFIG_ACPI
--
1.9.1
next prev parent reply other threads:[~2014-09-09 11:36 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-04 13:52 [PATCH v3 0/9] PM / Domains: Generic OF-based support Ulf Hansson
2014-09-04 13:52 ` [PATCH v3 1/9] ACPI / PM: Let acpi_dev_pm_detach() return an error code Ulf Hansson
2014-08-23 22:45 ` Pavel Machek
2014-09-07 22:12 ` Rafael J. Wysocki
2014-09-04 13:52 ` [PATCH v3 2/9] PM / Domains: Add generic OF-based PM domain look-up Ulf Hansson
2014-09-07 22:13 ` Rafael J. Wysocki
2014-09-08 7:26 ` Ulf Hansson
2014-09-08 21:04 ` Rafael J. Wysocki
2014-09-08 21:08 ` Rafael J. Wysocki
2014-09-08 20:53 ` Geert Uytterhoeven
2014-09-08 21:26 ` Rafael J. Wysocki
2014-09-09 11:40 ` Mark Brown
2014-09-09 13:45 ` Rafael J. Wysocki
2014-09-08 20:53 ` Tomasz Figa
2014-09-09 7:04 ` Ulf Hansson
2014-09-04 13:52 ` [PATCH v3 3/9] PM / Domains: Add APIs to attach/detach a PM domain for a device Ulf Hansson
2014-09-08 22:11 ` Rafael J. Wysocki
2014-09-04 13:52 ` [PATCH v3 4/9] drivercore / platform: Convert to dev_pm_domain_attach|detach() Ulf Hansson
2014-09-04 13:52 ` [PATCH v3 5/9] i2c: core: " Ulf Hansson
2014-09-04 13:52 ` [PATCH v3 6/9] mmc: sdio: " Ulf Hansson
2014-09-04 13:52 ` [PATCH v3 7/9] spi: core: " Ulf Hansson
2014-09-04 13:52 ` [PATCH v3 8/9] amba: Add support for attach/detach of PM domains Ulf Hansson
2014-09-04 13:52 ` [PATCH v3 9/9] ARM: exynos: Move to generic PM domain DT bindings Ulf Hansson
2014-09-05 15:39 ` [PATCH v3 0/9] PM / Domains: Generic OF-based support Kevin Hilman
2014-09-09 11:36 ` [PATCH v4 " Ulf Hansson
2014-09-09 11:36 ` Ulf Hansson [this message]
2014-09-12 21:05 ` [v4, 1/9] ACPI / PM: Let acpi_dev_pm_detach() return an error code Dmitry Torokhov
2014-09-14 16:38 ` Rafael J. Wysocki
2014-09-15 16:53 ` Dmitry Torokhov
2014-09-15 23:36 ` Rafael J. Wysocki
2014-09-17 18:25 ` Ulf Hansson
2014-09-17 20:10 ` Dmitry Torokhov
2014-09-17 23:20 ` Ulf Hansson
2014-09-17 23:43 ` Dmitry Torokhov
2014-09-18 0:35 ` Ulf Hansson
2014-09-18 23:13 ` Rafael J. Wysocki
2014-09-09 11:36 ` [PATCH v4 2/9] PM / Domains: Add generic OF-based PM domain look-up Ulf Hansson
2014-09-09 11:36 ` [PATCH v4 3/9] PM / Domains: Add APIs to attach/detach a PM domain for a device Ulf Hansson
2014-09-09 11:36 ` [PATCH v4 4/9] drivercore / platform: Convert to dev_pm_domain_attach|detach() Ulf Hansson
2014-09-09 13:46 ` Rafael J. Wysocki
2014-09-09 11:36 ` [PATCH v4 5/9] i2c: core: " Ulf Hansson
2014-09-09 11:36 ` [PATCH v4 6/9] mmc: sdio: " Ulf Hansson
2014-09-09 11:36 ` [PATCH v4 7/9] spi: core: " Ulf Hansson
2014-09-09 11:36 ` [PATCH v4 8/9] amba: Add support for attach/detach of PM domains Ulf Hansson
2014-09-09 11:36 ` [PATCH v4 9/9] ARM: exynos: Move to generic PM domain DT bindings Ulf Hansson
2014-09-09 11:43 ` [PATCH v4 0/9] PM / Domains: Generic OF-based support Tomasz Figa
2014-09-09 11:54 ` Mark Brown
2014-09-09 12:45 ` Ulf Hansson
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=1410262570-22785-2-git-send-email-ulf.hansson@linaro.org \
--to=ulf.hansson@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
/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).