summaryrefslogtreecommitdiffstats
path: root/drivers/pci
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2017-10-25 14:16:46 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2017-11-06 13:56:49 +0100
commitc2eac4d3a115e2f511844e7bcf73f4e877fbf5da (patch)
treecb9b9944babe208a856d58e2e284715096bf2ae5 /drivers/pci
parentPM / core: Add NEVER_SKIP and SMART_PREPARE driver flags (diff)
downloadlinux-c2eac4d3a115e2f511844e7bcf73f4e877fbf5da.tar.xz
linux-c2eac4d3a115e2f511844e7bcf73f4e877fbf5da.zip
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>
Diffstat (limited to 'drivers/pci')
-rw-r--r--drivers/pci/pci.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 6078dfc11b11..374f5686e2bc 100644
--- 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;
/*