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: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Acked-by: Bjorn Helgaas <bhelgaas@google.com>

diff --git a/Documentation/power/pci.rst b/Documentation/power/pci.rst
index a39b2461919a3c683f055030bd762f4b85a39d6d..aa1c7fce6cd05bd2e0325d4ac81101348be19e74 100644 (file)
--- a/Documentation/power/pci.rst
+++ b/Documentation/power/pci.rst
@@ -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

diff --git a/drivers/acpi/acpi_lpss.c b/drivers/acpi/acpi_lpss.c
index c4a84df6cc98aaac36e3a95735afb93b2b3c3a34..7632df1a5be368687c900306d2d6cd32bf4b9868 100644 (file)
--- a/drivers/acpi/acpi_lpss.c
+++ b/drivers/acpi/acpi_lpss.c
@@ -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);

diff --git a/drivers/acpi/device_pm.c b/drivers/acpi/device_pm.c
index 1b02d7dc7d34ccd221767d2ce46b9334468f631d..8c2a091728a9141871be59f9e090b4843715172a 100644 (file)
--- a/drivers/acpi/device_pm.c
+++ b/drivers/acpi/device_pm.c
@@ -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);

diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c
index 5adf0be6aa470bafa1b04a615cac5fc4d5261a66..f98eced0f200ce33262b6d705c4940ac6354979f 100644 (file)
--- a/drivers/base/power/main.c
+++ b/drivers/base/power/main.c
@@ -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) {

diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
index ce220b1987dfc6326e988e17efe977aaee758bae..decf82595340182c43ab7020d8e725b7c4aa635e 100644 (file)
--- a/drivers/pci/pci-driver.c
+++ b/drivers/pci/pci-driver.c
@@ -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);

diff --git a/include/linux/pm.h b/include/linux/pm.h
index e057d1fa24694fedb22675b0520398c8805c85e4..d89b7099f2419ced16096e600bfef44a4da00bd8 100644 (file)
--- a/include/linux/pm.h
+++ b/include/linux/pm.h
@@ -758,7 +758,7 @@ 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 bool dev_pm_may_skip_resume(struct device *dev);
+extern bool dev_pm_skip_resume(struct device *dev);
 extern bool dev_pm_smart_suspend_and_suspended(struct device *dev);
 
 #else /* !CONFIG_PM_SLEEP */