Merge branch 'pci/misc' into next

* pci/misc:
  MAINTAINERS: Add ACPI folks for ACPI-related things under drivers/pci
  PCI: Add CircuitCo vendor ID and subsystem ID
  PCI: Use pdev->pm_cap instead of pci_find_capability(..,PCI_CAP_ID_PM)

2 files changed, 3 insertions, 5 deletions

diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 709791b70ca0..e37fea6e178d 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -805,7 +805,7 @@ pci_power_t pci_choose_state(struct pci_dev *dev, pm_message_t state)
 {
         pci_power_t ret;
 
-        if (!pci_find_capability(dev, PCI_CAP_ID_PM))
+        if (!dev->pm_cap)
                 return PCI_D0;
 
         ret = platform_pci_choose_state(dev);
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index c3a04026cca8..e85d23044ae0 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -1834,7 +1834,6 @@ static void quirk_e100_interrupt(struct pci_dev *dev)
         u16 command, pmcsr;
         u8 __iomem *csr;
         u8 cmd_hi;
-        int pm;
 
         switch (dev->device) {
         /* PCI IDs taken from drivers/net/e100.c */
@@ -1872,9 +1871,8 @@ static void quirk_e100_interrupt(struct pci_dev *dev)
          * Check that the device is in the D0 power state. If it's not,
          * there is no point to look any further.
          */
-        pm = pci_find_capability(dev, PCI_CAP_ID_PM);
-        if (pm) {
-                pci_read_config_word(dev, pm + PCI_PM_CTRL, &pmcsr);
+        if (dev->pm_cap) {
+                pci_read_config_word(dev, dev->pm_cap + PCI_PM_CTRL, &pmcsr);
                 if ((pmcsr & PCI_PM_CTRL_STATE_MASK) != PCI_D0)
                         return;
         }