Commit 4cf563c5 authored by Heikki Krogerus's avatar Heikki Krogerus Committed by Rafael J. Wysocki
Browse files

ACPI / PM: Export rest of the subsys PM callbacks



No reason for excluding the remaining ones.

Signed-off-by: default avatarHeikki Krogerus <heikki.krogerus@linux.intel.com>
[rjw: Rebased and exported the new acpi_subsys_complete() too.]
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent f25c0ae2
Loading
Loading
Loading
Loading
+4 −1
Original line number Original line Diff line number Diff line
@@ -928,7 +928,7 @@ EXPORT_SYMBOL_GPL(acpi_subsys_prepare);
 * acpi_subsys_complete - Finalize device's resume during system resume.
 * acpi_subsys_complete - Finalize device's resume during system resume.
 * @dev: Device to handle.
 * @dev: Device to handle.
 */
 */
static void acpi_subsys_complete(struct device *dev)
void acpi_subsys_complete(struct device *dev)
{
{
	/*
	/*
	 * If the device had been runtime-suspended before the system went into
	 * If the device had been runtime-suspended before the system went into
@@ -938,6 +938,7 @@ static void acpi_subsys_complete(struct device *dev)
	if (dev->power.direct_complete)
	if (dev->power.direct_complete)
		pm_request_resume(dev);
		pm_request_resume(dev);
}
}
EXPORT_SYMBOL_GPL(acpi_subsys_complete);


/**
/**
 * acpi_subsys_suspend - Run the device driver's suspend callback.
 * acpi_subsys_suspend - Run the device driver's suspend callback.
@@ -951,6 +952,7 @@ int acpi_subsys_suspend(struct device *dev)
	pm_runtime_resume(dev);
	pm_runtime_resume(dev);
	return pm_generic_suspend(dev);
	return pm_generic_suspend(dev);
}
}
EXPORT_SYMBOL_GPL(acpi_subsys_suspend);


/**
/**
 * acpi_subsys_suspend_late - Suspend device using ACPI.
 * acpi_subsys_suspend_late - Suspend device using ACPI.
@@ -996,6 +998,7 @@ int acpi_subsys_freeze(struct device *dev)
	pm_runtime_resume(dev);
	pm_runtime_resume(dev);
	return pm_generic_freeze(dev);
	return pm_generic_freeze(dev);
}
}
EXPORT_SYMBOL_GPL(acpi_subsys_freeze);


#endif /* CONFIG_PM_SLEEP */
#endif /* CONFIG_PM_SLEEP */


+6 −0
Original line number Original line Diff line number Diff line
@@ -554,14 +554,20 @@ static inline int acpi_subsys_runtime_resume(struct device *dev) { return 0; }
int acpi_dev_suspend_late(struct device *dev);
int acpi_dev_suspend_late(struct device *dev);
int acpi_dev_resume_early(struct device *dev);
int acpi_dev_resume_early(struct device *dev);
int acpi_subsys_prepare(struct device *dev);
int acpi_subsys_prepare(struct device *dev);
void acpi_subsys_complete(struct device *dev);
int acpi_subsys_suspend_late(struct device *dev);
int acpi_subsys_suspend_late(struct device *dev);
int acpi_subsys_resume_early(struct device *dev);
int acpi_subsys_resume_early(struct device *dev);
int acpi_subsys_suspend(struct device *dev);
int acpi_subsys_freeze(struct device *dev);
#else
#else
static inline int acpi_dev_suspend_late(struct device *dev) { return 0; }
static inline int acpi_dev_suspend_late(struct device *dev) { return 0; }
static inline int acpi_dev_resume_early(struct device *dev) { return 0; }
static inline int acpi_dev_resume_early(struct device *dev) { return 0; }
static inline int acpi_subsys_prepare(struct device *dev) { return 0; }
static inline int acpi_subsys_prepare(struct device *dev) { return 0; }
static inline void acpi_subsys_complete(struct device *dev) {}
static inline int acpi_subsys_suspend_late(struct device *dev) { return 0; }
static inline int acpi_subsys_suspend_late(struct device *dev) { return 0; }
static inline int acpi_subsys_resume_early(struct device *dev) { return 0; }
static inline int acpi_subsys_resume_early(struct device *dev) { return 0; }
static inline int acpi_subsys_suspend(struct device *dev) { return 0; }
static inline int acpi_subsys_freeze(struct device *dev) { return 0; }
#endif
#endif


#if defined(CONFIG_ACPI) && defined(CONFIG_PM)
#if defined(CONFIG_ACPI) && defined(CONFIG_PM)