ARM: PCI: Use PCI Express Capability accessors
authorJiang Liu <jiang.liu@huawei.com>
Tue, 24 Jul 2012 09:20:13 +0000 (17:20 +0800)
committerBjorn Helgaas <bhelgaas@google.com>
Thu, 23 Aug 2012 16:11:12 +0000 (10:11 -0600)
Use PCI Express Capability access functions to simplify ARM PCIe code.

Signed-off-by: Jiang Liu <jiang.liu@huawei.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Acked-by: Stephen Warren <swarren@wwwdotorg.org>
arch/arm/mach-tegra/pcie.c

index d3ad5150d6609e135a063421d2c9acad62e204df..c25a2a4f2e3d5c8e8a2073e045e4f3d550ea25bc 100644 (file)
@@ -367,17 +367,7 @@ DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_NVIDIA, 0x0bf1, tegra_pcie_fixup_class);
 /* Tegra PCIE requires relaxed ordering */
 static void __devinit tegra_pcie_relax_enable(struct pci_dev *dev)
 {
-       u16 val16;
-       int pos = pci_find_capability(dev, PCI_CAP_ID_EXP);
-
-       if (pos <= 0) {
-               dev_err(&dev->dev, "skipping relaxed ordering fixup\n");
-               return;
-       }
-
-       pci_read_config_word(dev, pos + PCI_EXP_DEVCTL, &val16);
-       val16 |= PCI_EXP_DEVCTL_RELAX_EN;
-       pci_write_config_word(dev, pos + PCI_EXP_DEVCTL, val16);
+       pcie_capability_set_word(dev, PCI_EXP_DEVCTL, PCI_EXP_DEVCTL_RELAX_EN);
 }
 DECLARE_PCI_FIXUP_FINAL(PCI_ANY_ID, PCI_ANY_ID, tegra_pcie_relax_enable);