rk: revert 20f3d0b+v3.0.66 to v3.0

[firefly-linux-kernel-4.4.55.git] / drivers / pci / pci.c

diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index d549bbc93cddf7d55f7b1193692e7bb8a330ae87..692671b11667381516b9d95101e26415c10e35fc 100644 (file)
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -1905,7 +1905,7 @@ void pci_enable_ari(struct pci_dev *dev)
 {
        int pos;
        u32 cap;
-       u16 flags, ctrl;
+       u16 ctrl;
        struct pci_dev *bridge;
 
        if (!pci_is_pcie(dev) || dev->devfn)
@@ -1923,11 +1923,6 @@ void pci_enable_ari(struct pci_dev *dev)
        if (!pos)
                return;
 
-       /* ARI is a PCIe v2 feature */
-       pci_read_config_word(bridge, pos + PCI_EXP_FLAGS, &flags);
-       if ((flags & PCI_EXP_FLAGS_VERS) < 2)
-               return;
-
        pci_read_config_dword(bridge, pos + PCI_EXP_DEVCAP2, &cap);
        if (!(cap & PCI_EXP_DEVCAP2_ARI))
                return;