From: Bjorn Helgaas <bhelgaas@google.com>
Date: Wed, 5 Dec 2012 20:51:18 +0000 (-0700)
Subject: PCI/portdrv: Use PCI Express Capability accessors
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=33e8b34fdd5640f3aa1597710352349cbc823374;p=linux-beck.git

PCI/portdrv: Use PCI Express Capability accessors

Use PCI Express Capability access functions to simplify portdrv.

Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
---

diff --git a/drivers/pci/pcie/portdrv_core.c b/drivers/pci/pcie/portdrv_core.c
index d03a7a39b2d8..70d3555903ae 100644
--- a/drivers/pci/pcie/portdrv_core.c
+++ b/drivers/pci/pcie/portdrv_core.c
@@ -120,8 +120,7 @@ static int pcie_port_enable_msix(struct pci_dev *dev, int *vectors, int mask)
 		 * the value in this field indicates which MSI-X Table entry is
 		 * used to generate the interrupt message."
 		 */
-		pos = pci_pcie_cap(dev);
-		pci_read_config_word(dev, pos + PCI_EXP_FLAGS, &reg16);
+		pcie_capability_read_word(dev, PCI_EXP_FLAGS, &reg16);
 		entry = (reg16 & PCI_EXP_FLAGS_IRQ) >> 9;
 		if (entry >= nr_entries)
 			goto Error;