PCI/PM: Drop the runtime_d3cold device flag

The runtime_d3cold flag is not needed any more, so drop it.

Link: https://lore.kernel.org/r/8077784.T7Z3S40VBb@kreacher
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com>

diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
index ee58688..d76fab6 100644 (file)
--- a/drivers/pci/pci-driver.c
+++ b/drivers/pci/pci-driver.c
@@ -1342,8 +1342,6 @@ static int pci_pm_runtime_resume(struct device *dev)
        if (pm && pm->runtime_resume)
                error = pm->runtime_resume(dev);
 
-       pci_dev->runtime_d3cold = false;
-
        return error;
 }
 

diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index e6c7f48..9924176 100644 (file)
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -2703,8 +2703,6 @@ int pci_finish_runtime_suspend(struct pci_dev *dev)
        if (target_state == PCI_POWER_ERROR)
                return -EIO;
 
-       dev->runtime_d3cold = target_state == PCI_D3cold;
-
        /*
         * There are systems (for example, Intel mobile chips since Coffee
         * Lake) where the power drawn while suspended can be significantly
@@ -2722,7 +2720,6 @@ int pci_finish_runtime_suspend(struct pci_dev *dev)
        if (error) {
                pci_enable_wake(dev, target_state, false);
                pci_restore_ptm_state(dev);
-               dev->runtime_d3cold = false;
        }
 
        return error;

diff --git a/include/linux/pci.h b/include/linux/pci.h
index 60adf42..3266ac0 100644 (file)
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -379,10 +379,6 @@ struct pci_dev {
        unsigned int    mmio_always_on:1;       /* Disallow turning off io/mem
                                                   decoding during BAR sizing */
        unsigned int    wakeup_prepared:1;
-       unsigned int    runtime_d3cold:1;       /* Whether go through runtime
-                                                  D3cold, not set for devices
-                                                  powered on/off by the
-                                                  corresponding bridge */
        unsigned int    skip_bus_pm:1;  /* Internal: Skip bus-level PM */
        unsigned int    ignore_hotplug:1;       /* Ignore hotplug events */
        unsigned int    hotplug_user_indicators:1; /* SlotCtl indicators