PCI/PM: Simplify pci_pm_suspend_noirq()

We always want to save the device state unless the driver has already done
it.  Rearrange the checking in pci_pm_suspend_noirq() to make this more
clear.  No functional change intended.

[bhelgaas: commit log, rewrap comment]
Link: https://lore.kernel.org/r/20220830104913.1620539-1-rajvi.jingar@linux.intel.com
Signed-off-by: Rajvi Jingar <rajvi.jingar@linux.intel.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
index 5d8c37c3e15a2ba395955109ed79557b21c764a2..107d77f3c846708f0eac6c857b757502e2cc6de0 100644 (file)
--- a/drivers/pci/pci-driver.c
+++ b/drivers/pci/pci-driver.c
@@ -873,20 +873,15 @@ static int pci_pm_suspend_noirq(struct device *dev)
                }
        }
 
-       if (pci_dev->skip_bus_pm) {
+       if (!pci_dev->state_saved) {
+               pci_save_state(pci_dev);
+
                /*
-                * Either the device is a bridge with a child in D0 below it, or
-                * the function is running for the second time in a row without
-                * going through full resume, which is possible only during
-                * suspend-to-idle in a spurious wakeup case.  The device should
-                * be in D0 at this point, but if it is a bridge, it may be
-                * necessary to save its state.
+                * If the device is a bridge with a child in D0 below it,
+                * it needs to stay in D0, so check skip_bus_pm to avoid
+                * putting it into a low-power state in that case.
                 */
-               if (!pci_dev->state_saved)
-                       pci_save_state(pci_dev);
-       } else if (!pci_dev->state_saved) {
-               pci_save_state(pci_dev);
-               if (pci_power_manageable(pci_dev))
+               if (!pci_dev->skip_bus_pm && pci_power_manageable(pci_dev))
                        pci_prepare_to_sleep(pci_dev);
        }