PCI: Unfold conditions to block runtime PM on PCIe ports

The conditions to block D3 on parent ports are currently condensed into a
single expression in pci_dev_check_d3cold().  Upcoming commits will add
further conditions for hotplug ports, making this expression fairly large
and impenetrable.  Unfold the conditions to maintain readability when they
are amended.

No functional change intended.

Signed-off-by: Lukas Wunner <lukas@wunner.de>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
CC: Mika Westerberg <mika.westerberg@linux.intel.com>
CC: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index a40ba02252658f9712de2e45e3e12f7737e40403..d86351a2fe6e3111d60dae7818f822f608286770 100644 (file)
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -2274,19 +2274,20 @@ bool pci_bridge_d3_possible(struct pci_dev *bridge)
 static int pci_dev_check_d3cold(struct pci_dev *dev, void *data)
 {
        bool *d3cold_ok = data;
-       bool no_d3cold;
 
-       /*
-        * The device needs to be allowed to go D3cold and if it is wake
-        * capable to do so from D3cold.
-        */
-       no_d3cold = dev->no_d3cold || !dev->d3cold_allowed ||
-               (device_may_wakeup(&dev->dev) && !pci_pme_capable(dev, PCI_D3cold)) ||
-               !pci_power_manageable(dev);
+       if (/* The device needs to be allowed to go D3cold ... */
+           dev->no_d3cold || !dev->d3cold_allowed ||
+
+           /* ... and if it is wakeup capable to do so from D3cold. */
+           (device_may_wakeup(&dev->dev) &&
+            !pci_pme_capable(dev, PCI_D3cold)) ||
+
+           /* If it is a bridge it must be allowed to go to D3. */
+           !pci_power_manageable(dev))
 
-       *d3cold_ok = !no_d3cold;
+               *d3cold_ok = false;
 
-       return no_d3cold;
+       return !*d3cold_ok;
 }
 
 /*