Patchwork [RFC,v2,12/32] PCI/ARM: use PCIe capabilities access functions to simplify implementation

login
register
mail settings
Submitter Jiang Liu
Date July 24, 2012, 4:31 p.m.
Message ID <1343147504-25891-13-git-send-email-jiang.liu@huawei.com>
Download mbox | patch
Permalink /patch/172943/
State Superseded
Headers show

Comments

Jiang Liu - July 24, 2012, 4:31 p.m.
From: Jiang Liu <jiang.liu@huawei.com>

Use PCIe capabilities access functions to simplify PCIe ARM implementation.

Signed-off-by: Jiang Liu <liuj97@gmail.com>
---
 arch/arm/mach-tegra/pcie.c |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

Patch

diff --git a/arch/arm/mach-tegra/pcie.c b/arch/arm/mach-tegra/pcie.c
index 0e09137..e41e64d 100644
--- a/arch/arm/mach-tegra/pcie.c
+++ b/arch/arm/mach-tegra/pcie.c
@@ -368,16 +368,15 @@  DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_NVIDIA, 0x0bf1, tegra_pcie_fixup_class);
 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) {
+	if (!pci_is_pcie(dev)) {
 		dev_err(&dev->dev, "skipping relaxed ordering fixup\n");
 		return;
 	}
 
-	pci_read_config_word(dev, pos + PCI_EXP_DEVCTL, &val16);
+	pci_pcie_capability_read_word(dev, PCI_EXP_DEVCTL, &val16);
 	val16 |= PCI_EXP_DEVCTL_RELAX_EN;
-	pci_write_config_word(dev, pos + PCI_EXP_DEVCTL, val16);
+	pci_pcie_capability_write_word(dev, PCI_EXP_DEVCTL, val16);
 }
 DECLARE_PCI_FIXUP_FINAL(PCI_ANY_ID, PCI_ANY_ID, tegra_pcie_relax_enable);