Commit 76c70cb5 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

PM: sleep: core: Rename dev_pm_may_skip_resume() 



The name of dev_pm_may_skip_resume() may be easily confused with the
power.may_skip_resume flag which is not checked by that function, so
rename the former as dev_pm_skip_resume().

No functional impact.

Suggested-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Acked-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent 0fe8a1be

Documentation/power/pci.rst

+1 −1
Original line number Diff line number Diff line
@@ -1034,7 +1034,7 @@ device to be left in suspend after system-wide transitions to the working state. 
This flag is checked by the PM core, but the PCI bus type informs the PM core

which devices may be left in suspend from its perspective (that happens during

the "noirq" phase of system-wide suspend and analogous transitions) and next it

uses the dev_pm_may_skip_resume() helper to decide whether or not to return from

uses the dev_pm_skip_resume() helper to decide whether or not to return from

pci_pm_resume_noirq() and pci_pm_resume_early() upfront.



3.2. Device Runtime Power Management

drivers/acpi/acpi_lpss.c

+2 −2
Original line number Diff line number Diff line
@@ -1093,7 +1093,7 @@ static int acpi_lpss_resume_early(struct device *dev) 
	if (pdata->dev_desc->resume_from_noirq)

		return 0;



	if (dev_pm_may_skip_resume(dev))

	if (dev_pm_skip_resume(dev))

		return 0;



	return acpi_lpss_do_resume_early(dev);
@@ -1105,7 +1105,7 @@ static int acpi_lpss_resume_noirq(struct device *dev) 
	int ret;



	/* Follow acpi_subsys_resume_noirq(). */

	if (dev_pm_may_skip_resume(dev))

	if (dev_pm_skip_resume(dev))

		return 0;



	ret = pm_generic_resume_noirq(dev);

drivers/acpi/device_pm.c

+2 −2
Original line number Diff line number Diff line
@@ -1127,7 +1127,7 @@ EXPORT_SYMBOL_GPL(acpi_subsys_suspend_noirq); 
 */

static int acpi_subsys_resume_noirq(struct device *dev)

{

	if (dev_pm_may_skip_resume(dev))

	if (dev_pm_skip_resume(dev))

		return 0;



	return pm_generic_resume_noirq(dev);
@@ -1145,7 +1145,7 @@ static int acpi_subsys_resume_early(struct device *dev) 
{

	int ret;



	if (dev_pm_may_skip_resume(dev))

	if (dev_pm_skip_resume(dev))

		return 0;



	ret = acpi_dev_resume(dev);

drivers/base/power/main.c

+4 −4
Original line number Diff line number Diff line
@@ -562,7 +562,7 @@ static void dpm_watchdog_clear(struct dpm_watchdog *wd) 
/*------------------------- Resume routines -------------------------*/



/**

 * dev_pm_may_skip_resume - System-wide device resume optimization check.

 * dev_pm_skip_resume - System-wide device resume optimization check.

 * @dev: Target device.

 *

 * Return:
@@ -572,7 +572,7 @@ static void dpm_watchdog_clear(struct dpm_watchdog *wd) 
 * - The logical negation of %power.must_resume otherwise (that is, when the

 *   transition under way is RESUME).

 */

bool dev_pm_may_skip_resume(struct device *dev)

bool dev_pm_skip_resume(struct device *dev)

{

	if (pm_transition.event == PM_EVENT_RESTORE)

		return false;
@@ -611,7 +611,7 @@ static int device_resume_noirq(struct device *dev, pm_message_t state, bool asyn 
	if (!dpm_wait_for_superior(dev, async))

		goto Out;



	skip_resume = dev_pm_may_skip_resume(dev);

	skip_resume = dev_pm_skip_resume(dev);

	/*

	 * If the driver callback is skipped below or by the middle layer

	 * callback and device_resume_early() also skips the driver callback for
@@ -797,7 +797,7 @@ static int device_resume_early(struct device *dev, pm_message_t state, bool asyn 
	if (callback)

		goto Run;



	if (dev_pm_may_skip_resume(dev))

	if (dev_pm_skip_resume(dev))

		goto Skip;



	if (dev->driver && dev->driver->pm) {

drivers/pci/pci-driver.c

+2 −2
Original line number Diff line number Diff line
@@ -891,7 +891,7 @@ static int pci_pm_resume_noirq(struct device *dev) 
	pci_power_t prev_state = pci_dev->current_state;

	bool skip_bus_pm = pci_dev->skip_bus_pm;



	if (dev_pm_may_skip_resume(dev))

	if (dev_pm_skip_resume(dev))

		return 0;



	/*
@@ -920,7 +920,7 @@ static int pci_pm_resume_noirq(struct device *dev) 


static int pci_pm_resume_early(struct device *dev)

{

	if (dev_pm_may_skip_resume(dev))

	if (dev_pm_skip_resume(dev))

		return 0;



	return pm_generic_resume_early(dev);

CRA Git | Maintained and supported by SUSTech CRA and CCSE