[PATCH 2/2] mtip32xx: prefer pcie_capability_read_word()

[Bjorn Helgaas]

From: Bjorn Helgaas <bhelg...@google.com>

Replace pci_read_config_word() with pcie_capability_read_word().

pcie_capability_read_word() takes care of a few special cases when reading
the PCIe capability.  See 8c0d3a02c130 ("PCI: Add accessors for PCI Express
Capability").

Signed-off-by: Bjorn Helgaas <bhelg...@google.com>
---
 drivers/block/mtip32xx/mtip32xx.c | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/drivers/block/mtip32xx/mtip32xx.c 
b/drivers/block/mtip32xx/mtip32xx.c
index 543eb30a3bc0..a0f9bf152ddc 100644
--- a/drivers/block/mtip32xx/mtip32xx.c
+++ b/drivers/block/mtip32xx/mtip32xx.c
@@ -3924,14 +3924,10 @@ static DEFINE_HANDLER(7);
 
 static void mtip_disable_link_opts(struct driver_data *dd, struct pci_dev 
*pdev)
 {
-       int pos;
        unsigned short pcie_dev_ctrl;
 
-       pos = pci_find_capability(pdev, PCI_CAP_ID_EXP);
-       if (pos) {
-               pci_read_config_word(pdev,
-                       pos + PCI_EXP_DEVCTL,
-                       &pcie_dev_ctrl);
+       if (pci_is_pcie(pdev)) {
+               pcie_capability_read_word(pdev, PCI_EXP_DEVCTL, &pcie_dev_ctrl);
                if (pcie_dev_ctrl & PCI_EXP_DEVCTL_NOSNOOP_EN ||
                    pcie_dev_ctrl & PCI_EXP_DEVCTL_RELAX_EN) {
                        dev_info(&dd->pdev->dev,
@@ -3939,8 +3935,7 @@ static void mtip_disable_link_opts(struct driver_data 
*dd, struct pci_dev *pdev)
                                        pdev->vendor, pdev->device);
                        pcie_dev_ctrl &= ~(PCI_EXP_DEVCTL_NOSNOOP_EN |
                                                PCI_EXP_DEVCTL_RELAX_EN);
-                       pci_write_config_word(pdev,
-                               pos + PCI_EXP_DEVCTL,
+                       pcie_capability_write_word(pdev, PCI_EXP_DEVCTL,
                                pcie_dev_ctrl);
                }
        }
-- 
2.25.1