ACPI / PM: Restore acpi_subsys_complete() (e4da817d) · Commits · 戴 / test

Commit (PM / PCI / ACPI: Kick devices that might have been reset by firmware), made PCI's and ACPI's ->complete() callbacks to be assigned to a new API called pm_complete_with_resume_check(), which was introduced in the same change. Later it turned out that using pm_complete_with_resume_check() wasn't good enough for PCI, as it needed additional PCI specific checks, before deciding whether runtime resuming the device is needed when running the ->complete() callback. This leaves ACPI as the only user of pm_complete_with_resume_check(). Therefore let's restore ACPI's acpi_subsys_complete(), which was dropped in commit (PM / PCI / ACPI: Kick devices that might have been reset by firmware). This enables us to remove the pm_complete_with_resume_check() API in a following change, but it also enables ACPI to add more ACPI specific checks in acpi_subsys_complete() if that turns out to be necessary. Signed-off-by:

Ulf Hansson <ulf.hansson@linaro.org> Signed-off-by:

Rafael J. Wysocki <rafael.j.wysocki@intel.com>

drivers/acpi/acpi_lpss.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -894,7 +894,7 @@ static struct dev_pm_domain acpi_lpss_pm_domain = {
		#ifdef CONFIG_PM
		#ifdef CONFIG_PM_SLEEP
		.prepare = acpi_subsys_prepare,
		.complete = pm_complete_with_resume_check,
		.complete = acpi_subsys_complete,
		.suspend = acpi_subsys_suspend,
		.suspend_late = acpi_lpss_suspend_late,
		.resume_early = acpi_lpss_resume_early,

drivers/acpi/device_pm.c

+18 −1

Original line number	Diff line number	Diff line
		@@ -996,6 +996,23 @@ int acpi_subsys_prepare(struct device *dev)
		}
		EXPORT_SYMBOL_GPL(acpi_subsys_prepare);

		/**
		* acpi_subsys_complete - Finalize device's resume during system resume.
		* @dev: Device to handle.
		*/
		void acpi_subsys_complete(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(acpi_subsys_complete);

		/**
		* acpi_subsys_suspend - Run the device driver's suspend callback.
		* @dev: Device to handle.
		@@ -1064,7 +1081,7 @@ static struct dev_pm_domain acpi_general_pm_domain = {
		.runtime_resume = acpi_subsys_runtime_resume,
		#ifdef CONFIG_PM_SLEEP
		.prepare = acpi_subsys_prepare,
		.complete = pm_complete_with_resume_check,
		.complete = acpi_subsys_complete,
		.suspend = acpi_subsys_suspend,
		.suspend_late = acpi_subsys_suspend_late,
		.resume_early = acpi_subsys_resume_early,

Admin message