PCI / PM: Use the NEVER_SKIP driver flag

Replace the PCI-specific flag PCI_DEV_FLAGS_NEEDS_RESUME with the
PM core's DPM_FLAG_NEVER_SKIP one everywhere and drop it.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Acked-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Ulf Hansson <ulf.hansson@linaro.org>

diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 9f45cfeae775545f7dc85688f1f2a20a3de9c561..f124de3a0668d5f02f3b0015bdacd4c78177f8cc 100644 (file)
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -1304,7 +1304,7 @@ int i915_driver_load(struct pci_dev *pdev, const struct pci_device_id *ent)
         * becaue the HDA driver may require us to enable the audio power
         * domain during system suspend.
         */
-       pdev->dev_flags |= PCI_DEV_FLAGS_NEEDS_RESUME;
+       dev_pm_set_driver_flags(&pdev->dev, DPM_FLAG_NEVER_SKIP);
 
        ret = i915_driver_init_early(dev_priv, ent);
        if (ret < 0)

diff --git a/drivers/misc/mei/pci-me.c b/drivers/misc/mei/pci-me.c
index 4ff40d3196765a444ead85dabf8730fa2777a622..f17e4b435fa974bf93eb3c80fa29d44a1302de36 100644 (file)
--- a/drivers/misc/mei/pci-me.c
+++ b/drivers/misc/mei/pci-me.c
@@ -223,7 +223,7 @@ static int mei_me_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
         * MEI requires to resume from runtime suspend mode
         * in order to perform link reset flow upon system suspend.
         */
-       pdev->dev_flags |= PCI_DEV_FLAGS_NEEDS_RESUME;
+       dev_pm_set_driver_flags(&pdev->dev, DPM_FLAG_NEVER_SKIP);
 
        /*
        * For not wake-able HW runtime pm framework

diff --git a/drivers/misc/mei/pci-txe.c b/drivers/misc/mei/pci-txe.c
index e38a5f144373451fc87007ffc1cf4292059c5408..f911a08e3579fadd1b5b577bd4ee1f4d0fb56429 100644 (file)
--- a/drivers/misc/mei/pci-txe.c
+++ b/drivers/misc/mei/pci-txe.c
@@ -141,7 +141,7 @@ static int mei_txe_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
         * MEI requires to resume from runtime suspend mode
         * in order to perform link reset flow upon system suspend.
         */
-       pdev->dev_flags |= PCI_DEV_FLAGS_NEEDS_RESUME;
+       dev_pm_set_driver_flags(&pdev->dev, DPM_FLAG_NEVER_SKIP);
 
        /*
        * For not wake-able HW runtime pm framework

diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 6078dfc11b112a88aec1c58eb911de9f996b6644..374f5686e2bc13923a88c2b207b1b51ab651e847 100644 (file)
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -2166,8 +2166,7 @@ bool pci_dev_keep_suspended(struct pci_dev *pci_dev)
 
        if (!pm_runtime_suspended(dev)
            || pci_target_state(pci_dev, wakeup) != pci_dev->current_state
-           || platform_pci_need_resume(pci_dev)
-           || (pci_dev->dev_flags & PCI_DEV_FLAGS_NEEDS_RESUME))
+           || platform_pci_need_resume(pci_dev))
                return false;
 
        /*

diff --git a/include/linux/pci.h b/include/linux/pci.h
index f4f8ee5a7362e982c0084d619c8ed1996a38f770..4b65fa4fb94ecd3b4007c5da27c42fff4f11c8a1 100644 (file)
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -205,13 +205,8 @@ enum pci_dev_flags {
        PCI_DEV_FLAGS_BRIDGE_XLATE_ROOT = (__force pci_dev_flags_t) (1 << 9),
        /* Do not use FLR even if device advertises PCI_AF_CAP */
        PCI_DEV_FLAGS_NO_FLR_RESET = (__force pci_dev_flags_t) (1 << 10),
-       /*
-        * Resume before calling the driver's system suspend hooks, disabling
-        * the direct_complete optimization.
-        */
-       PCI_DEV_FLAGS_NEEDS_RESUME = (__force pci_dev_flags_t) (1 << 11),
        /* Don't use Relaxed Ordering for TLPs directed at this device */
-       PCI_DEV_FLAGS_NO_RELAXED_ORDERING = (__force pci_dev_flags_t) (1 << 12),
+       PCI_DEV_FLAGS_NO_RELAXED_ORDERING = (__force pci_dev_flags_t) (1 << 11),
 };
 
 enum pci_irq_reroute_variant {