PM: sleep: core: Rename dev_pm_smart_suspend_and_suspended()

Because all callers of dev_pm_smart_suspend_and_suspended use it only
for checking whether or not to skip driver suspend callbacks for a
device, rename it to dev_pm_skip_suspend() in analogy with
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/drivers/acpi/acpi_lpss.c b/drivers/acpi/acpi_lpss.c
index 7632df1..5e2bfbc 100644 (file)
--- a/drivers/acpi/acpi_lpss.c
+++ b/drivers/acpi/acpi_lpss.c
@@ -1041,7 +1041,7 @@ static int acpi_lpss_do_suspend_late(struct device *dev)
 {
        int ret;
 
-       if (dev_pm_smart_suspend_and_suspended(dev))
+       if (dev_pm_skip_suspend(dev))
                return 0;
 
        ret = pm_generic_suspend_late(dev);
@@ -1169,7 +1169,7 @@ static int acpi_lpss_poweroff_late(struct device *dev)
 {
        struct lpss_private_data *pdata = acpi_driver_data(ACPI_COMPANION(dev));
 
-       if (dev_pm_smart_suspend_and_suspended(dev))
+       if (dev_pm_skip_suspend(dev))
                return 0;
 
        if (pdata->dev_desc->resume_from_noirq)
@@ -1182,7 +1182,7 @@ static int acpi_lpss_poweroff_noirq(struct device *dev)
 {
        struct lpss_private_data *pdata = acpi_driver_data(ACPI_COMPANION(dev));
 
-       if (dev_pm_smart_suspend_and_suspended(dev))
+       if (dev_pm_skip_suspend(dev))
                return 0;
 
        if (pdata->dev_desc->resume_from_noirq) {

diff --git a/drivers/acpi/device_pm.c b/drivers/acpi/device_pm.c
index 8c2a091..ae234d7 100644 (file)
--- a/drivers/acpi/device_pm.c
+++ b/drivers/acpi/device_pm.c
@@ -1084,7 +1084,7 @@ int acpi_subsys_suspend_late(struct device *dev)
 {
        int ret;
 
-       if (dev_pm_smart_suspend_and_suspended(dev))
+       if (dev_pm_skip_suspend(dev))
                return 0;
 
        ret = pm_generic_suspend_late(dev);
@@ -1100,7 +1100,7 @@ int acpi_subsys_suspend_noirq(struct device *dev)
 {
        int ret;
 
-       if (dev_pm_smart_suspend_and_suspended(dev))
+       if (dev_pm_skip_suspend(dev))
                return 0;
 
        ret = pm_generic_suspend_noirq(dev);
@@ -1213,7 +1213,7 @@ static int acpi_subsys_poweroff_late(struct device *dev)
 {
        int ret;
 
-       if (dev_pm_smart_suspend_and_suspended(dev))
+       if (dev_pm_skip_suspend(dev))
                return 0;
 
        ret = pm_generic_poweroff_late(dev);
@@ -1229,7 +1229,7 @@ static int acpi_subsys_poweroff_late(struct device *dev)
  */
 static int acpi_subsys_poweroff_noirq(struct device *dev)
 {
-       if (dev_pm_smart_suspend_and_suspended(dev))
+       if (dev_pm_skip_suspend(dev))
                return 0;
 
        return pm_generic_poweroff_noirq(dev);

diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c
index f98eced..3170d93 100644 (file)
--- a/drivers/base/power/main.c
+++ b/drivers/base/power/main.c
@@ -567,8 +567,7 @@ static void dpm_watchdog_clear(struct dpm_watchdog *wd)
  *
  * Return:
  * - %false if the transition under way is RESTORE.
- * - The return value of dev_pm_smart_suspend_and_suspended() if the transition
- *   under way is THAW.
+ * - Return value of dev_pm_skip_suspend() if the transition under way is THAW.
  * - The logical negation of %power.must_resume otherwise (that is, when the
  *   transition under way is RESUME).
  */
@@ -578,7 +577,7 @@ bool dev_pm_skip_resume(struct device *dev)
                return false;
 
        if (pm_transition.event == PM_EVENT_THAW)
-               return dev_pm_smart_suspend_and_suspended(dev);
+               return dev_pm_skip_suspend(dev);
 
        return !dev->power.must_resume;
 }
@@ -624,7 +623,7 @@ static int device_resume_noirq(struct device *dev, pm_message_t state, bool asyn
         */
        if (skip_resume)
                pm_runtime_set_suspended(dev);
-       else if (dev_pm_smart_suspend_and_suspended(dev))
+       else if (dev_pm_skip_suspend(dev))
                pm_runtime_set_active(dev);
 
        if (dev->pm_domain) {
@@ -1223,7 +1222,7 @@ static int __device_suspend_noirq(struct device *dev, pm_message_t state, bool a
        if (callback)
                goto Run;
 
-       if (dev_pm_smart_suspend_and_suspended(dev))
+       if (dev_pm_skip_suspend(dev))
                goto Skip;
 
        if (dev->driver && dev->driver->pm) {
@@ -1415,7 +1414,7 @@ static int __device_suspend_late(struct device *dev, pm_message_t state, bool as
        if (callback)
                goto Run;
 
-       if (dev_pm_smart_suspend_and_suspended(dev))
+       if (dev_pm_skip_suspend(dev))
                goto Skip;
 
        if (dev->driver && dev->driver->pm) {
@@ -2003,7 +2002,7 @@ void device_pm_check_callbacks(struct device *dev)
        spin_unlock_irq(&dev->power.lock);
 }
 
-bool dev_pm_smart_suspend_and_suspended(struct device *dev)
+bool dev_pm_skip_suspend(struct device *dev)
 {
        return dev_pm_test_driver_flags(dev, DPM_FLAG_SMART_SUSPEND) &&
                pm_runtime_status_suspended(dev);

diff --git a/drivers/pci/hotplug/pciehp_core.c b/drivers/pci/hotplug/pciehp_core.c
index 312cc45..bf779f2 100644 (file)
--- a/drivers/pci/hotplug/pciehp_core.c
+++ b/drivers/pci/hotplug/pciehp_core.c
@@ -275,7 +275,7 @@ static int pciehp_suspend(struct pcie_device *dev)
         * If the port is already runtime suspended we can keep it that
         * way.
         */
-       if (dev_pm_smart_suspend_and_suspended(&dev->port->dev))
+       if (dev_pm_skip_suspend(&dev->port->dev))
                return 0;
 
        pciehp_disable_interrupt(dev);

diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
index decf825..da6510a 100644 (file)
--- a/drivers/pci/pci-driver.c
+++ b/drivers/pci/pci-driver.c
@@ -776,7 +776,7 @@ static int pci_pm_suspend(struct device *dev)
 
 static int pci_pm_suspend_late(struct device *dev)
 {
-       if (dev_pm_smart_suspend_and_suspended(dev))
+       if (dev_pm_skip_suspend(dev))
                return 0;
 
        pci_fixup_device(pci_fixup_suspend, to_pci_dev(dev));
@@ -789,7 +789,7 @@ static int pci_pm_suspend_noirq(struct device *dev)
        struct pci_dev *pci_dev = to_pci_dev(dev);
        const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;
 
-       if (dev_pm_smart_suspend_and_suspended(dev))
+       if (dev_pm_skip_suspend(dev))
                return 0;
 
        if (pci_has_legacy_pm_support(pci_dev))
@@ -1126,7 +1126,7 @@ static int pci_pm_poweroff(struct device *dev)
 
 static int pci_pm_poweroff_late(struct device *dev)
 {
-       if (dev_pm_smart_suspend_and_suspended(dev))
+       if (dev_pm_skip_suspend(dev))
                return 0;
 
        pci_fixup_device(pci_fixup_suspend, to_pci_dev(dev));
@@ -1139,7 +1139,7 @@ static int pci_pm_poweroff_noirq(struct device *dev)
        struct pci_dev *pci_dev = to_pci_dev(dev);
        const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;
 
-       if (dev_pm_smart_suspend_and_suspended(dev))
+       if (dev_pm_skip_suspend(dev))
                return 0;
 
        if (pci_has_legacy_pm_support(pci_dev))

diff --git a/include/linux/pm.h b/include/linux/pm.h
index d89b709..8c59a7f 100644 (file)
--- a/include/linux/pm.h
+++ b/include/linux/pm.h
@@ -759,7 +759,7 @@ extern int pm_generic_poweroff(struct device *dev);
 extern void pm_generic_complete(struct device *dev);
 
 extern bool dev_pm_skip_resume(struct device *dev);
-extern bool dev_pm_smart_suspend_and_suspended(struct device *dev);
+extern bool dev_pm_skip_suspend(struct device *dev);
 
 #else /* !CONFIG_PM_SLEEP */