Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0e708fc6 authored by Ulf Hansson's avatar Ulf Hansson Committed by Rafael J. Wysocki
Browse files

PM / sleep: Remove pm_complete_with_resume_check() 



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: default avatarUlf Hansson <ulf.hansson@linaro.org>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 8af4b3d7

drivers/base/power/generic_ops.c

+0 −23
Original line number Diff line number Diff line
@@ -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 */

include/linux/pm.h

+0 −1
Original line number Diff line number Diff line
@@ -736,7 +736,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 */