From: Ulf Hansson <ulf.hansson@linaro.org>
To: Wolfram Sang <wsa@the-dreams.de>,
"Rafael J . Wysocki" <rjw@rjwysocki.net>,
Len Brown <lenb@kernel.org>,
linux-acpi@vger.kernel.org, linux-pm@vger.kernel.org
Cc: Kevin Hilman <khilman@kernel.org>,
Jarkko Nikula <jarkko.nikula@linux.intel.com>,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
Mika Westerberg <mika.westerberg@linux.intel.com>,
Jisheng Zhang <jszhang@marvell.com>,
John Stultz <john.stultz@linaro.org>,
Guodong Xu <guodong.xu@linaro.org>,
Sumit Semwal <sumit.semwal@linaro.org>,
Haojian Zhuang <haojian.zhuang@linaro.org>,
linux-arm-kernel@lists.infradead.org, linux-i2c@vger.kernel.org,
Ulf Hansson <ulf.hansson@linaro.org>
Subject: [PATCH 3/9] PM / Sleep: Remove pm_complete_with_resume_check()
Date: Wed, 21 Jun 2017 21:21:22 +0200 [thread overview]
Message-ID: <1498072888-14782-4-git-send-email-ulf.hansson@linaro.org> (raw)
In-Reply-To: <1498072888-14782-1-git-send-email-ulf.hansson@linaro.org>
According to recent changes for ACPI, the are longer any users of
pm_complete_with_resume_check(), thus let's drop it.
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
---
drivers/base/power/generic_ops.c | 23 -----------------------
include/linux/pm.h | 1 -
2 files changed, 24 deletions(-)
diff --git a/drivers/base/power/generic_ops.c b/drivers/base/power/generic_ops.c
index 07c3c4a..b2ed606 100644
--- a/drivers/base/power/generic_ops.c
+++ b/drivers/base/power/generic_ops.c
@@ -9,7 +9,6 @@
#include <linux/pm.h>
#include <linux/pm_runtime.h>
#include <linux/export.h>
-#include <linux/suspend.h>
#ifdef CONFIG_PM
/**
@@ -298,26 +297,4 @@ void pm_generic_complete(struct device *dev)
if (drv && drv->pm && drv->pm->complete)
drv->pm->complete(dev);
}
-
-/**
- * pm_complete_with_resume_check - Complete a device power transition.
- * @dev: Device to handle.
- *
- * Complete a device power transition during a system-wide power transition and
- * optionally schedule a runtime resume of the device if the system resume in
- * progress has been initated by the platform firmware and the device had its
- * power.direct_complete flag set.
- */
-void pm_complete_with_resume_check(struct device *dev)
-{
- pm_generic_complete(dev);
- /*
- * If the device had been runtime-suspended before the system went into
- * the sleep state it is going out of and it has never been resumed till
- * now, resume it in case the firmware powered it up.
- */
- if (dev->power.direct_complete && pm_resume_via_firmware())
- pm_request_resume(dev);
-}
-EXPORT_SYMBOL_GPL(pm_complete_with_resume_check);
#endif /* CONFIG_PM_SLEEP */
diff --git a/include/linux/pm.h b/include/linux/pm.h
index a0894bc..de28313 100644
--- a/include/linux/pm.h
+++ b/include/linux/pm.h
@@ -733,7 +733,6 @@ extern int pm_generic_poweroff_noirq(struct device *dev);
extern int pm_generic_poweroff_late(struct device *dev);
extern int pm_generic_poweroff(struct device *dev);
extern void pm_generic_complete(struct device *dev);
-extern void pm_complete_with_resume_check(struct device *dev);
#else /* !CONFIG_PM_SLEEP */
--
2.7.4
next prev parent reply other threads:[~2017-06-21 19:21 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-21 19:21 [PATCH 0/9] PM / ACPI / i2c: Fix system suspend and deploy runtime PM centric path for ACPI Ulf Hansson
2017-06-21 19:21 ` [PATCH 1/9] i2c: designware: Fix system suspend Ulf Hansson
2017-06-21 23:31 ` Rafael J. Wysocki
2017-06-22 10:49 ` Mika Westerberg
2017-06-22 11:16 ` Jarkko Nikula
2017-06-27 7:55 ` Jarkko Nikula
2017-06-28 14:01 ` Ulf Hansson
2017-06-28 14:51 ` Rafael J. Wysocki
2017-06-28 15:06 ` Ulf Hansson
2017-06-22 14:41 ` Rafael J. Wysocki
2017-06-22 21:37 ` Ulf Hansson
2017-06-22 22:01 ` Rafael J. Wysocki
2017-06-26 16:49 ` Ulf Hansson
2017-06-26 19:39 ` Grygorii Strashko
2017-06-26 21:11 ` Rafael J. Wysocki
2017-06-27 7:33 ` Jarkko Nikula
2017-06-27 15:25 ` Rafael J. Wysocki
2017-06-28 14:31 ` Ulf Hansson
2017-06-28 16:52 ` Grygorii Strashko
2017-09-08 3:23 ` [1/9] " Wangtao (Kevin, Kirin)
2017-09-08 8:29 ` Ulf Hansson
2017-09-12 9:44 ` Wangtao (Kevin, Kirin)
2017-06-21 19:21 ` [PATCH 2/9] PM / ACPI: Restore acpi_subsys_complete() Ulf Hansson
2017-06-21 19:21 ` Ulf Hansson [this message]
2017-06-21 19:21 ` [PATCH 4/9] PM / ACPI: Split code validating need for runtime resume in ->prepare() Ulf Hansson
2017-06-21 21:35 ` Rafael J. Wysocki
2017-06-21 19:21 ` [PATCH 5/9] PM / ACPI: Split acpi_lpss_suspend_late|resume_early() Ulf Hansson
2017-06-21 19:21 ` [PATCH 6/9] PM / ACPI: Provide option to disable direct_complete for ACPI devices Ulf Hansson
2017-06-21 21:42 ` Rafael J. Wysocki
2017-06-22 9:35 ` Ulf Hansson
2017-06-22 14:38 ` Rafael J. Wysocki
2017-06-22 21:29 ` Ulf Hansson
2017-06-22 21:33 ` Rafael J. Wysocki
2017-06-21 19:21 ` [PATCH 7/9] PM / ACPI: Enable the runtime PM centric approach for system sleep Ulf Hansson
2017-06-21 21:47 ` Rafael J. Wysocki
2017-06-22 9:42 ` Ulf Hansson
2017-06-22 14:32 ` Rafael J. Wysocki
2017-06-22 21:14 ` Ulf Hansson
2017-06-22 21:28 ` Rafael J. Wysocki
2017-06-21 19:21 ` [PATCH 8/9] PM / ACPI: Avoid runtime resuming device in acpi_subsys_suspend|freeze() Ulf Hansson
2017-06-21 19:21 ` [PATCH 9/9] i2c: designware: Deploy the runtime PM centric approach for system sleep Ulf Hansson
2017-06-21 22:39 ` [PATCH 0/9] PM / ACPI / i2c: Fix system suspend and deploy runtime PM centric path for ACPI John Stultz
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=1498072888-14782-4-git-send-email-ulf.hansson@linaro.org \
--to=ulf.hansson@linaro.org \
--cc=andriy.shevchenko@linux.intel.com \
--cc=guodong.xu@linaro.org \
--cc=haojian.zhuang@linaro.org \
--cc=jarkko.nikula@linux.intel.com \
--cc=john.stultz@linaro.org \
--cc=jszhang@marvell.com \
--cc=khilman@kernel.org \
--cc=lenb@kernel.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=mika.westerberg@linux.intel.com \
--cc=rjw@rjwysocki.net \
--cc=sumit.semwal@linaro.org \
--cc=wsa@the-dreams.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).