MIPS: PCI: Use PCI Express Capability accessors
authorJiang Liu <jiang.liu@huawei.com>
Tue, 24 Jul 2012 09:20:14 +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 MIPS PCIe code.

Signed-off-by: Jiang Liu <jiang.liu@huawei.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Acked-by: David Daney <david.daney@cavium.com>
arch/mips/pci/pci-octeon.c

index 52a1ba7..c5dfb2c 100644 (file)
@@ -117,16 +117,11 @@ int pcibios_plat_dev_init(struct pci_dev *dev)
        }
 
        /* Enable the PCIe normal error reporting */
-       pos = pci_find_capability(dev, PCI_CAP_ID_EXP);
-       if (pos) {
-               /* Update Device Control */
-               pci_read_config_word(dev, pos + PCI_EXP_DEVCTL, &config);
-               config |= PCI_EXP_DEVCTL_CERE; /* Correctable Error Reporting */
-               config |= PCI_EXP_DEVCTL_NFERE; /* Non-Fatal Error Reporting */
-               config |= PCI_EXP_DEVCTL_FERE;  /* Fatal Error Reporting */
-               config |= PCI_EXP_DEVCTL_URRE;  /* Unsupported Request */
-               pci_write_config_word(dev, pos + PCI_EXP_DEVCTL, config);
-       }
+       config = PCI_EXP_DEVCTL_CERE; /* Correctable Error Reporting */
+       config |= PCI_EXP_DEVCTL_NFERE; /* Non-Fatal Error Reporting */
+       config |= PCI_EXP_DEVCTL_FERE;  /* Fatal Error Reporting */
+       config |= PCI_EXP_DEVCTL_URRE;  /* Unsupported Request */
+       pcie_capability_set_word(dev, PCI_EXP_DEVCTL, config);
 
        /* Find the Advanced Error Reporting capability */
        pos = pci_find_ext_capability(dev, PCI_EXT_CAP_ID_ERR);